Skip to content

Fix compilation with serde 1.0.122 #9102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
Jan 25, 2021
Merged

Fix compilation with serde 1.0.122 #9102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
@alexcrichton
alexcrichton committed Jan 25, 2021
commit f097d02ea62111493b9f06d096a94dfddd020415
2 changes: 1 addition & 1 deletion src/cargo/util/config/de.rs
View file
Open in desktop
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