Release 1.6.1

davidv1992 · davidv1992 · commit 61b777b4b8a0 · 2025-07-16T09:24:23.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.6.1] - 2025-07-16
+
+### Fixed
+- Fixed mistake in the calculation of root dispersion used in serving and observability.
+
 ## [1.6.0] - 2025-06-26
 
 ### Added
@@ -301,6 +306,7 @@ process.
 - Fixed a bug in peer dispersion calculation which resulted in overly
   pessimistic dispersion estimates.
 
+[1.6.1]: https://github.com/pendulum-project/ntpd-rs/compare/v1.6.0...v1.6.1
 [1.6.0]: https://github.com/pendulum-project/ntpd-rs/compare/v1.5.0...v1.6.0
 [1.5.0]: https://github.com/pendulum-project/ntpd-rs/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/pendulum-project/ntpd-rs/compare/v1.3.1...v1.4.0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ resolver = "2"
 
 # Global settings for our crates
 [workspace.package]
-version = "1.6.0"
+version = "1.6.1"
 edition = "2021"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/pendulum-project/ntpd-rs"
@@ -60,4 +60,4 @@ zeroize = "1.7"
 
 # our own crates used as dependencies, same version as the workspace version
 # NOTE: keep this part at the bottom of the file, do not change this line
-ntp-proto = { version = "1.6.0", path = "./ntp-proto", default-features = false, features = ["__internal-api"] }
+ntp-proto = { version = "1.6.1", path = "./ntp-proto", default-features = false, features = ["__internal-api"] }
diff --git a/docs/man/ntp-ctl.8.md b/docs/man/ntp-ctl.8.md
@@ -1,5 +1,5 @@
 <!-- ---
-title: NTP-CTL(8) ntpd-rs 1.6.0 | ntpd-rs
+title: NTP-CTL(8) ntpd-rs 1.6.1 | ntpd-rs
 --- -->
 
 # NAME
diff --git a/docs/man/ntp-daemon.8.md b/docs/man/ntp-daemon.8.md
@@ -1,5 +1,5 @@
 <!-- ---
-title: NTP-DAEMON(8) ntpd-rs 1.6.0 | ntpd-rs
+title: NTP-DAEMON(8) ntpd-rs 1.6.1 | ntpd-rs
 --- -->
 
 # NAME
diff --git a/docs/man/ntp-metrics-exporter.8.md b/docs/man/ntp-metrics-exporter.8.md
@@ -1,5 +1,5 @@
 <!-- ---
-title: NTP-METRICS-EXPORTER(8) ntpd-rs 1.6.0 | ntpd-rs
+title: NTP-METRICS-EXPORTER(8) ntpd-rs 1.6.1 | ntpd-rs
 --- -->
 
 # NAME
diff --git a/docs/man/ntp.toml.5.md b/docs/man/ntp.toml.5.md
@@ -1,5 +1,5 @@
 <!-- ---
-title: NTP.TOML(5) ntpd-rs 1.6.0 | ntpd-rs
+title: NTP.TOML(5) ntpd-rs 1.6.1 | ntpd-rs
 --- -->
 
 # NAME
diff --git a/docs/precompiled/man/ntp-ctl.8 b/docs/precompiled/man/ntp-ctl.8
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "NTP-CTL" "8" "" "ntpd-rs 1.6.0" "ntpd-rs"
+.TH "NTP-CTL" "8" "" "ntpd-rs 1.6.1" "ntpd-rs"
 .hy
 .SH NAME
 .PP
diff --git a/docs/precompiled/man/ntp-daemon.8 b/docs/precompiled/man/ntp-daemon.8
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "NTP-DAEMON" "8" "" "ntpd-rs 1.6.0" "ntpd-rs"
+.TH "NTP-DAEMON" "8" "" "ntpd-rs 1.6.1" "ntpd-rs"
 .hy
 .SH NAME
 .PP
diff --git a/docs/precompiled/man/ntp-metrics-exporter.8 b/docs/precompiled/man/ntp-metrics-exporter.8
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "NTP-METRICS-EXPORTER" "8" "" "ntpd-rs 1.6.0" "ntpd-rs"
+.TH "NTP-METRICS-EXPORTER" "8" "" "ntpd-rs 1.6.1" "ntpd-rs"
 .hy
 .SH NAME
 .PP
diff --git a/docs/precompiled/man/ntp.toml.5 b/docs/precompiled/man/ntp.toml.5
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "NTP.TOML" "5" "" "ntpd-rs 1.6.0" "ntpd-rs"
+.TH "NTP.TOML" "5" "" "ntpd-rs 1.6.1" "ntpd-rs"
 .hy
 .SH NAME
 .PP
diff --git a/ntpd/build.rs b/ntpd/build.rs
@@ -29,7 +29,7 @@ fn main() {
             .ok()
             .map(|rev| {
                 if is_dirty {
-                    format!("{}-dirty", rev)
+                    format!("{rev}-dirty")
                 } else {
                     rev
                 }
diff --git a/ntpd/src/daemon/config/mod.rs b/ntpd/src/daemon/config/mod.rs
@@ -116,7 +116,7 @@ impl CliArg {
                                 // short version of --help has no arguments
                                 processed.push(CliArg::Flag(flag));
                             } else {
-                                Err(format!("'-{}' expects an argument", char))?;
+                                Err(format!("'-{char}' expects an argument"))?;
                             }
                             break;
                         } else {
diff --git a/ntpd/src/daemon/keyexchange.rs b/ntpd/src/daemon/keyexchange.rs
@@ -120,8 +120,7 @@ async fn run_nts_ke(
     for client_cert in &nts_ke_config.authorized_pool_server_certificates {
         let pool_certificate_file = std::fs::File::open(client_cert).map_err(|e| {
             io_error(&format!(
-                "error reading authorized-pool-server-certificate at `{:?}`: {:?}",
-                client_cert, e
+                "error reading authorized-pool-server-certificate at `{client_cert:?}`: {e:?}"
             ))
         })?;
         let mut certs: Vec<_> = ntp_proto::tls_utils::pemfile::certs(&mut std::io::BufReader::new(
@@ -133,8 +132,7 @@ async fn run_nts_ke(
             pool_certs.push(certs.pop().unwrap())
         } else {
             return Err(io_error(&format!(
-                "pool certificate file at `{:?}` should contain exactly one certificate",
-                client_cert
+                "pool certificate file at `{client_cert:?}` should contain exactly one certificate"
             )));
         }
     }
diff --git a/ntpd/src/daemon/spawn/standard.rs b/ntpd/src/daemon/spawn/standard.rs
@@ -330,17 +330,13 @@ mod tests {
         for addr in seen_addresses.iter() {
             assert!(
                 addresses.contains(addr),
-                "{:?} should have been drawn from {:?}",
-                addr,
-                addresses
+                "{addr:?} should have been drawn from {addresses:?}"
             );
         }
 
         assert!(
             seen_addresses.iter().any(|seen| seen != &initial_addr),
-            "Re-resolved\n\n\t{:?}\n\n should contain at least one address that isn't the original\n\n\t{:?}",
-            seen_addresses,
-            initial_addr,
+            "Re-resolved\n\n\t{seen_addresses:?}\n\n should contain at least one address that isn't the original\n\n\t{initial_addr:?}",
         );
     }
 
diff --git a/ntpd/src/force_sync/mod.rs b/ntpd/src/force_sync/mod.rs
@@ -21,20 +21,20 @@ fn human_readable_duration(abs_offset: f64) -> String {
     if offset >= 86400.0 {
         let days = (offset / 86400.0).floor() as u64;
         offset -= days as f64 * 86400.0;
-        res.push_str(&format!("{} day(s) ", days));
+        res.push_str(&format!("{days} day(s) "));
     }
     if offset >= 3600.0 {
         let hours = (offset / 3600.0).floor() as u64;
         offset -= hours as f64 * 3600.0;
-        res.push_str(&format!("{} hour(s) ", hours));
+        res.push_str(&format!("{hours} hour(s) "));
     }
     if offset >= 60.0 {
         let minutes = (offset / 60.0).floor() as u64;
         offset -= minutes as f64 * 60.0;
-        res.push_str(&format!("{} minute(s) ", minutes));
+        res.push_str(&format!("{minutes} minute(s) "));
     }
     if offset >= 1.0 {
-        res.push_str(&format!("{:.0} second(s)", offset));
+        res.push_str(&format!("{offset:.0} second(s)"));
     }
     res
 }
@@ -53,7 +53,7 @@ fn try_date_display(offset: NtpDuration) -> Option<String> {
 
     std::process::Command::new("date")
         .arg("-d")
-        .arg(format!("@{}", ts))
+        .arg(format!("@{ts}"))
         .arg("+%c")
         .output()
         .ok()
