Merge pull request #555 from cbgbt/with-hints

cargo: enable profile-hint-mostly-unused for AWS SDKs

Author: cbgbt

.cargo/config.toml

@@ -1,5 +1,6 @@
 [unstable]
 bindeps = true
+profile-hint-mostly-unused = true
 
 [build]
 # This is the recommended configuration that yields the

Cargo.toml

@@ -176,6 +176,26 @@ walkdir = "2"
 which = "6"
 zstd = "0.13"
 
+[profile.dev.package]
+aws-config = { hint-mostly-unused = true }
+aws-sdk-ebs = { hint-mostly-unused = true }
+aws-sdk-ec2 = { hint-mostly-unused = true }
+aws-sdk-kms = { hint-mostly-unused = true }
+aws-sdk-ssm = { hint-mostly-unused = true }
+aws-sdk-sts = { hint-mostly-unused = true }
+aws-smithy-types = { hint-mostly-unused = true }
+aws-types = { hint-mostly-unused = true }
+
+[profile.release.package]
+aws-config = { hint-mostly-unused = true }
+aws-sdk-ebs = { hint-mostly-unused = true }
+aws-sdk-ec2 = { hint-mostly-unused = true }
+aws-sdk-kms = { hint-mostly-unused = true }
+aws-sdk-ssm = { hint-mostly-unused = true }
+aws-sdk-sts = { hint-mostly-unused = true }
+aws-smithy-types = { hint-mostly-unused = true }
+aws-types = { hint-mostly-unused = true }
+
 # The profile that 'cargo dist' will build with
 [profile.dist]
 inherits = "release"

rust-toolchain.toml

@@ -2,5 +2,5 @@
 # particular date of the nightly compiler, but we want builds to be reproducable, so we lock to a
 # specific, recent instance of nightly.
 [toolchain]
-channel = "nightly-2025-02-28"
+channel = "nightly-2025-07-15"
 profile = "default"

tools/bottlerocket-variant/src/lib.rs

@@ -157,7 +157,7 @@ impl Variant {
     /// This can be used in a `build.rs` file to tell cargo that the crate needs to be rebuilt if
     /// the variant changes.
     pub fn rerun_if_changed() {
-        println!("cargo:rerun-if-env-changed={}", VARIANT_ENV);
+        println!("cargo:rerun-if-env-changed={VARIANT_ENV}");
     }
 
     /// This can be used in a `build.rs` file to emit `cfg` values that can be used for conditional
@@ -177,7 +177,7 @@ impl Variant {
     /// `#[cfg(variant_flavor = "none")]`
     pub fn emit_cfgs(&self) {
         Self::rerun_if_changed();
-        println!("cargo:rustc-cfg=variant=\"{}\"", self);
+        println!("cargo:rustc-cfg=variant=\"{self}\"");
         println!("cargo:rustc-cfg=variant_platform=\"{}\"", self.platform());
         println!("cargo:rustc-cfg=variant_runtime=\"{}\"", self.runtime());
         println!("cargo:rustc-cfg=variant_family=\"{}\"", self.family());
@@ -222,7 +222,7 @@ impl Variant {
                 variant: variant.clone()
             }
         );
-        let variant_family = format!("{}-{}", platform, runtime);
+        let variant_family = format!("{platform}-{runtime}");
         let variant_version = parts.next().map(|s| s.to_string());
         if let Some(value) = variant_version.as_ref() {
             ensure!(
@@ -293,7 +293,7 @@ impl<'de> Deserialize<'de> for Variant {
         D: Deserializer<'de>,
     {
         let value = String::deserialize(deserializer)?;
-        Variant::new(value).map_err(|e| D::Error::custom(format!("Error parsing variant: {}", e)))
+        Variant::new(value).map_err(|e| D::Error::custom(format!("Error parsing variant: {e}")))
     }
 }
 

tools/buildsys/src/args.rs

@@ -206,7 +206,7 @@ fn sensitive_env_vars(build_type: BuildFlags) -> impl Iterator<Item = &'static s
 pub(crate) fn rerun_for_envs(build_type: BuildType) {
     let build_flags: BuildFlags = build_type.into();
     for var in sensitive_env_vars(build_flags) {
-        println!("cargo:rerun-if-env-changed={}", var)
+        println!("cargo:rerun-if-env-changed={var}")
     }
 }
 

tools/buildsys/src/builder.rs

@@ -262,7 +262,7 @@ impl VariantBuildArgs {
         args.build_arg("VERSION_ID", &self.version_image);
 
         for image_feature in self.image_features.iter() {
-            args.build_arg(format!("{}", image_feature), "1");
+            args.build_arg(format!("{image_feature}"), "1");
         }
 
         args
@@ -303,7 +303,7 @@ impl RepackVariantBuildArgs {
         args.build_arg("VERSION_ID", &self.version_image);
 
         for image_feature in self.image_features.iter() {
-            args.build_arg(format!("{}", image_feature), "1");
+            args.build_arg(format!("{image_feature}"), "1");
         }
 
         args

tools/buildsys/src/cache.rs

@@ -63,14 +63,14 @@ impl LookasideCache {
                 match Self::verify_file(path, hash) {
                     Ok(_) => continue,
                     Err(e) => {
-                        println!("{}", e);
+                        println!("{e}");
                         fs::remove_file(path).context(error::ExternalFileDeleteSnafu { path })?;
                     }
                 }
             }
 
             let name = &path.display().to_string();
-            let tmp = PathBuf::from(format!(".{}", name));
+            let tmp = PathBuf::from(format!(".{name}"));
 
             // first check the lookaside cache
             let mut url = self.lookaside_cache.clone();
@@ -93,7 +93,7 @@ impl LookasideCache {
                 Err(e) => {
                     // next check with upstream, if permitted
                     if f.force_upstream.unwrap_or(false) || self.upstream_fallback {
-                        println!("Source not found in lookaside-cache. Fetching {:?} from upstream source", url_file_name);
+                        println!("Source not found in lookaside-cache. Fetching {url_file_name:?} from upstream source");
                         self.fetch_file(&f.url, &tmp, hash)?;
                         fs::rename(&tmp, path)
                             .context(error::ExternalFileRenameSnafu { path: &tmp })?;

tools/buildsys/src/gomod.rs

@@ -117,7 +117,7 @@ impl GoMod {
             module_path: package_dir,
             sdk_image: sdk.to_string(),
             go_mod_cache: &root_dir.join(".gomodcache"),
-            command: format!("./{}", GO_MOD_DOCKER_SCRIPT_NAME),
+            command: format!("./{GO_MOD_DOCKER_SCRIPT_NAME}"),
         };
 
         // Create and/or write the temporary script file to the package directory

tools/buildsys/src/main.rs

@@ -101,7 +101,7 @@ type Result<T> = std::result::Result<T, error::Error>;
 fn main() {
     let args = Buildsys::parse();
     if let Err(e) = run(args) {
-        eprintln!("{}", e);
+        eprintln!("{e}");
         process::exit(1);
     }
 }
@@ -119,7 +119,7 @@ fn run(args: Buildsys) -> Result<()> {
 fn build_package(args: BuildPackageArgs) -> Result<()> {
     let manifest_file = "Cargo.toml";
     let manifest_path = args.common.cargo_manifest_dir.join(manifest_file);
-    println!("cargo:rerun-if-changed={}", manifest_file);
+    println!("cargo:rerun-if-changed={manifest_file}");
     println!(
         "cargo:rerun-if-changed={}",
         args.common.root_dir.join(EXTERNAL_KIT_METADATA).display()
@@ -184,8 +184,8 @@ fn build_package(args: BuildPackageArgs) -> Result<()> {
     // Package developer can override name of package if desired, e.g. to name package with
     // characters invalid in Cargo crate names
     let package = manifest.info().package_name();
-    let spec = format!("{}.spec", package);
-    println!("cargo:rerun-if-changed={}", spec);
+    let spec = format!("{package}.spec");
+    println!("cargo:rerun-if-changed={spec}");
 
     let info = SpecInfo::new(PathBuf::from(&spec)).context(error::SpecParseSnafu)?;
 
@@ -209,7 +209,7 @@ fn build_package(args: BuildPackageArgs) -> Result<()> {
 
 fn build_kit(args: BuildKitArgs) -> Result<()> {
     let manifest_file = "Cargo.toml";
-    println!("cargo:rerun-if-changed={}", manifest_file);
+    println!("cargo:rerun-if-changed={manifest_file}");
     println!(
         "cargo:rerun-if-changed={}",
         args.common.root_dir.join(EXTERNAL_KIT_METADATA).display()
@@ -233,7 +233,7 @@ fn build_kit(args: BuildKitArgs) -> Result<()> {
 
 fn build_variant(args: BuildVariantArgs) -> Result<()> {
     let manifest_file = "Cargo.toml";
-    println!("cargo:rerun-if-changed={}", manifest_file);
+    println!("cargo:rerun-if-changed={manifest_file}");
     println!(
         "cargo:rerun-if-changed={}",
         args.common.root_dir.join(EXTERNAL_KIT_METADATA).display()

tools/include-env-compressed/include-env-compressed-macro/src/lib.rs

@@ -94,16 +94,16 @@ trait IncludedArchive {
 impl IncludedArchive for MacroArgs<Zstd> {
     fn emit_archive(&self) -> Result<TokenStream, IncludeError> {
         let env_var = &self.env_var;
-        let path = std::env::var(&env_var).context(EnvVarSnafu { env_var })?;
+        let path = std::env::var(env_var).context(EnvVarSnafu { env_var })?;
 
         let data = std::fs::read(&path).context(ReadArchiveSnafu { path })?;
 
         let compressed = zstd::encode_all(data.as_slice(), self.level).unwrap();
         let literal = Literal::byte_string(&compressed);
 
-        Ok(TokenStream::from(quote! {
+        Ok(quote! {
             ::include_env_compressed::Archive::zstd(#literal)
-        }))
+        })
     }
 }
 
@@ -131,9 +131,9 @@ impl<Compression> Parse for MacroArgs<Compression> {
 impl IncludedArchive for MacroArgs<Uncompressed> {
     fn emit_archive(&self) -> Result<TokenStream, IncludeError> {
         let env_var = &self.env_var;
-        Ok(TokenStream::from(quote! {
+        Ok(quote! {
             ::include_env_compressed::Archive::uncompressed(include_bytes!(env!(#env_var)))
-        }))
+        })
     }
 }