Auto merge of #9129 - Eh2406:backport-serde, r=alexcrichton

bors · bors · commit 883002386058 · 2021-02-03T19:31:50.000Z
Backport #9102 to the 1.50 release branch As per #9124 (comment) here is a backport of #9102
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`	`}`