Merge pull request #9130 from Eh2406/backport-serde

alexcrichton · web-flow · commit d61c808dda80 · 2021-02-03T16:24:00.000-06:00
Backport #9102 to the 1.49 release branch
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo"
-version = "0.50.0"
+version = "0.50.1"
 edition = "2018"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
diff --git a/src/cargo/util/config/de.rs b/src/cargo/util/config/de.rs
@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
                 seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
             }
             Definition::Environment(env) => {
-                seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))
+                seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
             }
             Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),
         }

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {`
`527`	`527`	`seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))`
`528`	`528`	`}`
`529`	`529`	`Definition::Environment(env) => {`
`530`		`- seed.deserialize(Tuple2Deserializer(1i32, env.as_ref()))`
	`530`	`+ seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))`
`531`	`531`	`}`
`532`	`532`	`Definition::Cli => seed.deserialize(Tuple2Deserializer(2i32, "")),`
`533`	`533`	`}`