Skip to content

Commit

Permalink
Merge pull request #44 from takkt-ag/chore/dep-updates
Browse files Browse the repository at this point in the history
Update Cargo dependencies, satifsy new clippy lints
  • Loading branch information
pitkley authored Jan 27, 2025
2 parents 1997719 + 7aa7167 commit 9818cc6
Show file tree
Hide file tree
Showing 10 changed files with 327 additions and 690 deletions.
352 changes: 188 additions & 164 deletions Cargo.lock

Large diffs are not rendered by default.

633 changes: 122 additions & 511 deletions THIRD_PARTY_LICENSES.md

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions about.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ accepted = [
"BSD-3-Clause",
"ISC",
"MIT",
"MPL-2.0",
"Unicode-3.0",
]
workarounds = ["ring"]
Expand All @@ -12,5 +11,5 @@ no-clearly-defined = true
[ring]
accepted = ["OpenSSL"]

[unicode-ident]
accepted = ["Unicode-DFS-2016"]
[webpki-roots]
accepted = ["MPL-2.0"]
4 changes: 2 additions & 2 deletions checkmate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ publish = false
[dependencies]
checkmk-client = { path = "../checkmk-client/" }
color-eyre = "0.6.3"
clap = { version = "4.5.20", features = ["derive", "env", "wrap_help"] }
serde = { version = "1.0.214", features = ["derive"] }
clap = { version = "4.5.27", features = ["derive", "env", "wrap_help"] }
serde = { version = "1.0.217", features = ["derive"] }
serde_yaml = "0.9.34+deprecated"
6 changes: 3 additions & 3 deletions checkmk-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ authors = [
license = "Apache-2.0"

[dependencies]
reqwest = { version = "0.12.9", default-features = false, features = ["blocking", "json", "rustls-tls"] }
serde = { version = "1.0.214", features = ["derive"] }
thiserror = "2.0.0"
reqwest = { version = "0.12.12", default-features = false, features = ["blocking", "json", "rustls-tls"] }
serde = { version = "1.0.217", features = ["derive"] }
thiserror = "2.0.11"
2 changes: 1 addition & 1 deletion checkmk-client/src/changes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ impl ChangesApi for Client {
}
}

impl<'a> ChangesClient<'a> {
impl ChangesClient<'_> {
pub fn show_all_pending_changes(&self) -> Result<(ShowAllPendingChangesResponse, ETag)> {
self.0
.get_with_etag("/domain-types/activation_run/collections/pending_changes")
Expand Down
2 changes: 1 addition & 1 deletion checkmk-client/src/folders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ impl FoldersApi for Client {
}
}

impl<'a> FoldersClient<'a> {
impl FoldersClient<'_> {
pub fn create_folder(
&self,
folder: &CreateFolderRequest,
Expand Down
2 changes: 1 addition & 1 deletion checkmk-client/src/hosts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ impl HostsApi for Client {
}
}

impl<'a> HostsClient<'a> {
impl HostsClient<'_> {
pub fn create_host(&self, host: &CreateHostRequest) -> Result<(ShowHostResponse, ETag)> {
self.0
.post_with_etag("/domain-types/host_config/collections/all", host)
Expand Down
2 changes: 1 addition & 1 deletion checkmk-client/src/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ impl RulesApi for Client {
}
}

impl<'a> RulesClient<'a> {
impl RulesClient<'_> {
pub fn create_rule(&self, rule: &CreateRuleRequest) -> Result<ShowRuleResponse> {
self.0.post("/domain-types/rule/collections/all", rule)
}
Expand Down
9 changes: 6 additions & 3 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ allow = [
"BSD-3-Clause",
"ISC",
"MIT",
"MPL-2.0",
"Unicode-3.0",
]

Expand All @@ -14,8 +13,12 @@ exceptions = [
# https://tldrlegal.com/license/openssl-license-(openssl)
{ allow = ["ISC", "MIT", "OpenSSL"], name = "ring" },

# Unicode-DFS-2016 is a permissive license, if attribution in associated documentation is provided
{ allow = ["Unicode-DFS-2016"], crate = "unicode-ident" },
# MPL-2.0 is a copyleft license, but we can still fulfill its requirements if:
# - We include a copyright notice (which we do through `THIRD_PARTY_LICENSES.md`)
# - We include the full license (which we do through `THIRD_PARTY_LICENSES.md`)
# - We disclose source-code (which we do, since this tool is open-source)
# - We include instructions to obtain the source (which we do through `THIRD_PARTY_LICENSES.md`)
{ allow = ["MPL-2.0"], crate = "webpki-roots"},
]

[[licenses.clarify]]
Expand Down

0 comments on commit 9818cc6

Please sign in to comment.