From d83bcf31335da46fd141b6a2138394e636cfc839 Mon Sep 17 00:00:00 2001 From: David Laban Date: Wed, 11 Sep 2024 09:07:53 +0100 Subject: [PATCH] fix stats url handling --- crates/bin/src/args.rs | 2 +- crates/binstalk-fetchers/src/quickinstall.rs | 8 +++----- crates/binstalk/src/lib.rs | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/crates/bin/src/args.rs b/crates/bin/src/args.rs index 8fd1eba3..9881341e 100644 --- a/crates/bin/src/args.rs +++ b/crates/bin/src/args.rs @@ -675,7 +675,7 @@ mod test { .unwrap() .to_string(); assert!( - long_help.ends_with(binstalk::QUICK_INSTALL_STATS_URL), + long_help.ends_with(binstalk::QUICKINSTALL_STATS_URL), "{}", long_help ); diff --git a/crates/binstalk-fetchers/src/quickinstall.rs b/crates/binstalk-fetchers/src/quickinstall.rs index 55d7d42b..ebf6976a 100644 --- a/crates/binstalk-fetchers/src/quickinstall.rs +++ b/crates/binstalk-fetchers/src/quickinstall.rs @@ -16,7 +16,7 @@ use crate::{ }; const BASE_URL: &str = "https://github.com/cargo-bins/cargo-quickinstall/releases/download"; -pub const QUICK_INSTALL_STATS_URL: &str = +pub const QUICKINSTALL_STATS_URL: &str = "https://cargo-quickinstall-stats-server.fly.dev/record-install"; const QUICKINSTALL_SIGN_KEY: Cow<'static, str> = @@ -63,7 +63,6 @@ pub struct QuickInstall { package: String, package_url: Url, signature_url: Url, - stats_url: Url, signature_policy: SignaturePolicy, target_data: Arc, @@ -179,8 +178,6 @@ impl super::Fetcher for QuickInstall { .expect("package_url is pre-generated and should never be invalid url"), signature_url: Url::parse(&format!("{url}.sig")) .expect("signature_url is pre-generated and should never be invalid url"), - stats_url: Url::parse("{QUICK_INSTALL_STATS_URL}") - .expect("stats_url is pre-generated and should never be invalid url"), package, signature_policy, @@ -321,7 +318,8 @@ impl QuickInstall { return Ok(()); } - let mut url = self.stats_url.clone(); + let mut url = Url::parse(QUICKINSTALL_STATS_URL) + .expect("stats_url is pre-generated and should never be invalid url"); url.query_pairs_mut() .append_pair("crate", &self.data.name) .append_pair("version", &self.data.version) diff --git a/crates/binstalk/src/lib.rs b/crates/binstalk/src/lib.rs index 271c0f71..83df1938 100644 --- a/crates/binstalk/src/lib.rs +++ b/crates/binstalk/src/lib.rs @@ -10,4 +10,4 @@ pub use binstalk_registry as registry; pub use binstalk_types as manifests; pub use detect_targets::{get_desired_targets, DesiredTargets, TARGET}; -pub use fetchers::QUICK_INSTALL_STATS_URL; +pub use fetchers::QUICKINSTALL_STATS_URL;