Skip to content

Commit 70cb768

Browse files
Use resolver '3' for the workspace
Some important changes to how MSRV is handled were introduced in Rust 2024. We need to switch to resolver version 3 in order to have access to those changes. More information can be found in: https://rust-lang.github.io/rfcs/3537-msrv-resolver.html Switching resolvers sometimes require some code changes, which are integrated in this commit as a result of running "cargo fix --edition"
1 parent b3c5472 commit 70cb768

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[workspace]
22
members = ["nss/"]
33
exclude = ["vendor_rust/", "authd-oidc-brokers/third_party/libhimmelblau/", "parts/libhimmelblau/build"]
4-
resolver = "2"
4+
resolver = "3"
55

66
[profile.release]
77
lto = "thin"

nss/src/logs/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@ fn init_sys_logger(log_level: LevelFilter) {
5252
pid: std::process::id(),
5353
};
5454

55-
let logger = if let Ok(l) = syslog::unix(formatter) {
56-
l
57-
} else {
58-
eprintln!("failed to create syslog logger");
59-
return;
55+
let logger = match syslog::unix(formatter) {
56+
Ok(l) => l,
57+
_ => {
58+
eprintln!("failed to create syslog logger");
59+
return;
60+
}
6061
};
6162

6263
if let Err(err) = log::set_boxed_logger(Box::new(BasicLogger::new(logger))) {

0 commit comments

Comments
 (0)