Skip to content

Commit

Permalink
Auto merge of #9102 - alexcrichton:fix-serede, r=ehuss
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Jan 25, 2021
2 parents b52fc0a + f097d02 commit 17a7b07
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cargo/util/config/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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, "")),
}
Expand Down

0 comments on commit 17a7b07

Please sign in to comment.