From 96dc595eaf81312eace669b72d568d4e4cc01703 Mon Sep 17 00:00:00 2001
From: Jacob Finkelman <jfinkelm@amazon.com>
Date: Thu, 24 Feb 2022 18:24:33 +0000
Subject: [PATCH] HashMap::from not into

---
 crates/mdman/src/hbs.rs                  |  2 +-
 src/bin/cargo/commands/verify_project.rs |  6 ++----
 src/cargo/core/compiler/rustdoc.rs       |  3 +--
 src/cargo/core/compiler/standard_lib.rs  |  2 +-
 src/cargo/util/config/mod.rs             | 10 +++++-----
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/crates/mdman/src/hbs.rs b/crates/mdman/src/hbs.rs
index eefeb3c1a..022e696b8 100644
--- a/crates/mdman/src/hbs.rs
+++ b/crates/mdman/src/hbs.rs
@@ -30,7 +30,7 @@ pub fn expand(file: &Path, formatter: FormatterRef) -> Result<String, Error> {
         .to_str()
         .expect("utf8 filename")
         .to_string();
-    let data: HashMap<String, String> = [("man_name", man_name)].into();
+    let data = HashMap::from([("man_name", man_name)]);
     let expanded = handlebars.render("template", &data)?;
     Ok(expanded)
 }
diff --git a/src/bin/cargo/commands/verify_project.rs b/src/bin/cargo/commands/verify_project.rs
index c67bb6b80..46e3eb885 100644
--- a/src/bin/cargo/commands/verify_project.rs
+++ b/src/bin/cargo/commands/verify_project.rs
@@ -13,12 +13,10 @@ pub fn cli() -> App {
 
 pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     if let Err(e) = args.workspace(config) {
-        let h: HashMap<_, _> = [("invalid", e.to_string())].into();
-        config.shell().print_json(&h)?;
+        config.shell().print_json(&HashMap::from([("invalid", e.to_string())]))?;
         process::exit(1)
     }
 
-    let h: HashMap<_, _> = [("success", "true")].into();
-    config.shell().print_json(&h)?;
+    config.shell().print_json(&HashMap::from([("success", "true")]))?;
     Ok(())
 }
diff --git a/src/cargo/core/compiler/rustdoc.rs b/src/cargo/core/compiler/rustdoc.rs
index bbc8488ca..ff7f00f3c 100644
--- a/src/cargo/core/compiler/rustdoc.rs
+++ b/src/cargo/core/compiler/rustdoc.rs
@@ -64,9 +64,8 @@ pub struct RustdocExternMap {
 
 impl Default for RustdocExternMap {
     fn default() -> Self {
-        let registries = [(CRATES_IO_REGISTRY.into(), DOCS_RS_URL.into())].into();
         Self {
-            registries,
+            registries: HashMap::from([(CRATES_IO_REGISTRY.into(), DOCS_RS_URL.into())]),
             std: None,
         }
     }
diff --git a/src/cargo/core/compiler/standard_lib.rs b/src/cargo/core/compiler/standard_lib.rs
index 4de305cda..94242fdb8 100644
--- a/src/cargo/core/compiler/standard_lib.rs
+++ b/src/cargo/core/compiler/standard_lib.rs
@@ -53,7 +53,7 @@ pub fn resolve_std<'cfg>(
         })
         .collect::<CargoResult<Vec<_>>>()?;
     let crates_io_url = crate::sources::CRATES_IO_INDEX.parse().unwrap();
-    let patch = [(crates_io_url, patches)].into();
+    let patch = HashMap::from([(crates_io_url, patches)]);
     let members = vec![
         String::from("library/std"),
         String::from("library/core"),
diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs
index 24c32e817..0adfcb249 100644
--- a/src/cargo/util/config/mod.rs
+++ b/src/cargo/util/config/mod.rs
@@ -1171,7 +1171,7 @@ impl Config {
                     })?
                     .to_string();
                 let value = CV::String(str_path, Definition::Cli);
-                let map = [("include".to_string(), value)].into();
+                let map = HashMap::from([("include".to_string(), value)]);
                 CV::Table(map, Definition::Cli)
             } else {
                 // We only want to allow "dotted key" (see https://toml.io/en/v1.0.0#keys)
@@ -1416,7 +1416,7 @@ impl Config {
 
             if let Some(token) = value_map.remove("token") {
                 if let Vacant(entry) = value_map.entry("registry".into()) {
-                    let map = [("token".into(), token)].into();
+                    let map = HashMap::from([("token".into(), token)]);
                     let table = CV::Table(map, def.clone());
                     entry.insert(table);
                 }
@@ -1990,7 +1990,7 @@ pub fn save_credentials(
 
     // Move the old token location to the new one.
     if let Some(token) = toml.as_table_mut().unwrap().remove("token") {
-        let map: HashMap<_, _> = [("token".to_string(), token)].into();
+        let map = HashMap::from([("token".to_string(), token)]);
         toml.as_table_mut()
             .unwrap()
             .insert("registry".into(), map.into());
@@ -2001,11 +2001,11 @@ pub fn save_credentials(
         let (key, mut value) = {
             let key = "token".to_string();
             let value = ConfigValue::String(token, Definition::Path(file.path().to_path_buf()));
-            let map = [(key, value)].into();
+            let map = HashMap::from([(key, value)]);
             let table = CV::Table(map, Definition::Path(file.path().to_path_buf()));
 
             if let Some(registry) = registry {
-                let map = [(registry.to_string(), table)].into();
+                let map = HashMap::from([(registry.to_string(), table)]);
                 (
                     "registries".into(),
                     CV::Table(map, Definition::Path(file.path().to_path_buf())),