Auto merge of #9102 - alexcrichton:fix-serede, r=ehuss

bors · bors · commit 17a7b0748d75 · 2021-01-25T15:16:52.000Z
Fix compilation with serde 1.0.122 This may or may not be a bug in serde, but let's commit a fix here first in any case. Closes #9101
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`	`}`