update cargo-readme

sources/api/apiclient/Cargo.toml

@@ -32,7 +32,7 @@ simplelog = "0.12"
 snafu = { version = "0.7", features = ["futures"] }
 tokio = { version = "~1.25", default-features = false, features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread", "time"] }  # LTS
 tokio-tungstenite = { version = "0.16", default-features = false, features = ["connect"] }
-toml = "0.5"
+toml = "0.7"
 unindent = "0.1"
 url = "2"
 

sources/api/apiserver/Cargo.toml

@@ -37,4 +37,4 @@ generate-readme = { version = "0.1", path = "../../generate-readme" }
 
 [dev-dependencies]
 maplit = "1"
-toml = "0.5"
+toml = "0.7"

sources/api/datastore/Cargo.toml

@@ -22,4 +22,4 @@ generate-readme = { version = "0.1", path = "../../generate-readme" }
 
 [dev-dependencies]
 maplit = "1"
-toml = "0.5"
+toml = "0.7"

sources/api/early-boot-config/Cargo.toml

@@ -26,7 +26,7 @@ serde-xml-rs = "0.6"
 simplelog = "0.12"
 snafu = "0.7"
 tokio = { version = "~1.25", default-features = false, features = ["macros", "rt-multi-thread"] }  # LTS
-toml = "0.5"
+toml = "0.7"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 # vmw_backdoor includes x86_64 assembly, prevent it from building for ARM

sources/api/schnauzer/Cargo.toml

@@ -36,7 +36,7 @@ serde_json = "1"
 serde_plain = "1"
 snafu = "0.7"
 tokio = { version = "~1.25", default-features = false, features = ["macros", "rt-multi-thread"] } # LTS
-toml = "0.5"
+toml = "0.7"
 url = "2"
 
 [dev-dependencies]

sources/api/shibaken/Cargo.toml

@@ -19,7 +19,7 @@ serde_json = "1"
 simplelog = "0.12"
 snafu = "0.7"
 tokio = { version = "~1.25", default-features = false, features = ["macros", "rt-multi-thread"] }  # LTS
-toml = "0.5"
+toml = "0.7"
 
 [build-dependencies]
 generate-readme = { version = "0.1", path = "../../generate-readme" }

sources/api/storewolf/Cargo.toml

@@ -19,7 +19,7 @@ rand = { version = "0.8", default-features = false, features = ["std", "std_rng"
 semver = "1"
 simplelog = "0.12"
 snafu = "0.7"
-toml = "0.5"
+toml = "0.7"
 
 [build-dependencies]
 bottlerocket-variant = { version = "0.1", path = "../../bottlerocket-variant" }
@@ -32,7 +32,7 @@ merge-toml = { path = "merge-toml", version = "0.1" }
 # so it's important that it remains reentrant.
 models = { path = "../../models", version = "0.1" }
 snafu = "0.7"
-toml = "0.5"
+toml = "0.7"
 walkdir = "2"
 
 [[bin]]

sources/api/storewolf/merge-toml/Cargo.toml

@@ -8,4 +8,4 @@ publish = false
 
 [dependencies]
 snafu = "0.7"
-toml = "0.5"
+toml = "0.7"

sources/api/storewolf/merge-toml/src/lib.rs

@@ -71,32 +71,32 @@ type Result<T> = std::result::Result<T, error::Error>;
 #[cfg(test)]
 mod test {
     use super::merge_values;
-    use toml::toml;
+    use toml::{toml, Value};
 
     #[test]
     fn merge() {
-        let mut left = toml! {
+        let mut left = Value::Table(toml! {
             top1 = "left top1"
             top2 = "left top2"
             [settings.inner]
             inner_setting1 = "left inner_setting1"
             inner_setting2 = "left inner_setting2"
-        };
-        let right = toml! {
+        });
+        let right = Value::Table(toml! {
             top1 = "right top1"
             [settings]
             setting = "right setting"
             [settings.inner]
             inner_setting1 = "right inner_setting1"
             inner_setting3 = "right inner_setting3"
-        };
+        });
         // Can't comment inside this toml, unfortunately.
         // "top1" is being overwritten from right.
         // "top2" is only in the left and remains.
         // "setting" is only in the right side.
         // "inner" tests that recursion works; inner_setting1 is replaced, 2 is untouched, and
         // 3 is new.
-        let expected = toml! {
+        let expected = Value::Table(toml! {
             top1 = "right top1"
             top2 = "left top2"
             [settings]
@@ -105,7 +105,7 @@ mod test {
             inner_setting1 = "right inner_setting1"
             inner_setting2 = "left inner_setting2"
             inner_setting3 = "right inner_setting3"
-        };
+        });
         merge_values(&mut left, &right).unwrap();
         assert_eq!(left, expected);
     }

sources/cfsignal/Cargo.toml

@@ -12,7 +12,7 @@ log = "0.4"
 serde = { version = "1", features = ["derive"] }
 simplelog = "0.12"
 snafu = { version = "0.7" }
-toml = "0.5"
+toml = "0.7"
 tokio = { version = "~1.25", default-features = false, features = ["macros", "rt-multi-thread"] }
 aws-config = "0.55"
 aws-sdk-cloudformation = "0.28"

sources/deny.toml

@@ -56,12 +56,16 @@ license-files = [
 multiple-versions = "deny"
 wildcards = "deny"
 
-deny = [
-    { name = "structopt" },
-    { name = "clap", wrappers = [ "cargo-readme" ] },
-]
-
 skip = [
+    # Tough is using an older version of globset which is using
+    # an older version of aho-corasick
+    { name = "aho-corasick", version = "=0.7" },
+    # Netdog is using a feature of toml 0.5 that does not exist in
+    # newer versions.
+    # https://github.com/bottlerocket-os/bottlerocket/issues/3422
+    { name = "toml", version = "=0.5" },
+    # Indexmap and cached are using different versions of hashbrown
+    { name = "hashbrown", version = "=0.13" },
 ]
 
 skip-tree = [
@@ -74,13 +78,6 @@ skip-tree = [
     # dependency tree because windows-sys has many sub-crates
     # that differ in major version.
     { name = "windows-sys", version = "=0.42.0" },
-    # generate-readme pulls in an older clap that causes some duplicate
-    # dependencies
-    { name = "generate-readme", version = "=0.1.0" },
-    # serde_yaml actually uses a newer hashbrown dependency,
-    # but several crates in the graph pull in an older one, so skip for now
-    # until they can be updated
-    { name = "hashbrown", version = "=0.13.2" }
 ]
 
 [sources]

sources/driverdog/Cargo.toml

@@ -15,7 +15,7 @@ simplelog = "0.12"
 snafu = "0.7"
 serde = { version = "1", features = ["derive"] }
 tempfile = "3"
-toml = "0.5"
+toml = "0.7"
 
 [build-dependencies]
 generate-readme = { version = "0.1", path = "../generate-readme" }

sources/driverdog/src/main.rs

@@ -365,9 +365,10 @@ fn run() -> Result<()> {
     .flatten()
     {
         let path = entry.path();
-        let modules_sets: HashMap<String, DriverConfig> =
-            toml::from_slice(&fs::read(&path).context(error::ReadPathSnafu { path: &path })?)
-                .context(error::DeserializeSnafu { path: &path })?;
+        let modules_sets: HashMap<String, DriverConfig> = toml::from_str(
+            &fs::read_to_string(&path).context(error::ReadPathSnafu { path: &path })?,
+        )
+        .context(error::DeserializeSnafu { path: &path })?;
 
         all_modules_sets.extend(modules_sets);
     }

sources/metricdog/Cargo.toml

@@ -17,7 +17,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 simplelog = "0.12"
 snafu = { version = "0.7" }
-toml = "0.5"
+toml = "0.7"
 url = "2"
 
 [build-dependencies]

sources/models/Cargo.toml

@@ -24,7 +24,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_plain = "1"
 snafu = "0.7"
-toml = "0.5"
+toml = "0.7"
 x509-parser = "0.14"
 url = "2"
 

sources/updater/update_metadata/Cargo.toml

@@ -17,7 +17,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_plain = "1"
 snafu = "0.7"
-toml = "0.5"
+toml = "0.7"
 
 [lib]
 name = "update_metadata"

sources/updater/updog/Cargo.toml

@@ -21,7 +21,7 @@ serde_plain = "1"
 signpost = { path = "../signpost", version = "0.1" }
 simplelog = "0.12"
 snafu = "0.7"
-toml = "0.5"
+toml = "0.7"
 tough = { version = "0.14", features = ["http"] }
 update_metadata = { path = "../update_metadata", version = "0.1" }
 url = "2"