diff --git a/Cargo.toml b/Cargo.toml index dca77e898e..a58aece6d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = ["nss/"] exclude = ["vendor_rust/", "authd-oidc-brokers/third_party/libhimmelblau/", "parts/libhimmelblau/build"] -resolver = "2" +resolver = "3" [profile.release] lto = "thin" diff --git a/debian/control b/debian/control index 16a917b89b..b79d434629 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13), dh-exec, dh-golang, dctrl-tools, - cargo (>= 1.82) | cargo-1.82, + cargo (>= 1.84) | cargo-1.84, # FIXME: We need cargo-vendor-filterer starting from plucky, but noble isn't ready yet # so workaround it, making it kind of optional, and requiring it only on versions after # noble (controlled via base-files version that matches the one in noble). diff --git a/nss/Cargo.toml b/nss/Cargo.toml index d86dd2903c..ec5d108ab9 100644 --- a/nss/Cargo.toml +++ b/nss/Cargo.toml @@ -2,6 +2,7 @@ name = "nss" version = "0.1.0" edition = "2021" +rust-version = "1.84.0" [lib] crate-type = ["cdylib"] diff --git a/nss/src/logs/mod.rs b/nss/src/logs/mod.rs index 2a228b6b8f..9bf64e6176 100644 --- a/nss/src/logs/mod.rs +++ b/nss/src/logs/mod.rs @@ -52,11 +52,12 @@ fn init_sys_logger(log_level: LevelFilter) { pid: std::process::id(), }; - let logger = if let Ok(l) = syslog::unix(formatter) { - l - } else { - eprintln!("failed to create syslog logger"); - return; + let logger = match syslog::unix(formatter) { + Ok(l) => l, + _ => { + eprintln!("failed to create syslog logger"); + return; + } }; if let Err(err) = log::set_boxed_logger(Box::new(BasicLogger::new(logger))) {