Support cargo:rustc-cfg in build.rs #4296
Conversation
| @@ -83,6 +83,7 @@ pub struct PackageData { | |||
| pub dependencies: Vec<PackageDependency>, | |||
| pub edition: Edition, | |||
| pub features: Vec<String>, | |||
| pub cfgs: Vec<PathBuf>, | |||
There was a problem hiding this comment.
TIL BuildScript::cfgs in cargo_metadata crate is Vec<PathBuf> !
But why ?
There was a problem hiding this comment.
Might well be a copy-paste error in cargo_metadata; the cargo documentation says:
single identifier, or any arbitrary key/value pair [...] key should be a Rust identifier, the value should be a string
which should well be covered by String rather than PathBuf/OsString. Should I send an issue/PR to cargo_metadata?
There was a problem hiding this comment.
oli-obk/cargo_metadata#112 has been merged and I changed the code to minimize the needed changes once that hits crates.io.
| pub fn insert_cfgs(&mut self, iter: impl IntoIterator<Item = SmolStr>) { | ||
| iter.into_iter().for_each(|cfg| match cfg.find('=') { | ||
| Some(split) => self | ||
| .insert_key_value(cfg[0..split].into(), cfg[split + 1..].trim_matches('"').into()), |
There was a problem hiding this comment.
In theory, we should unescape the RHS here, but in practice, I don't think it is relevant here, right?
|
LGTM ! |
| @@ -53,4 +53,13 @@ impl CfgOptions { | |||
| pub fn insert_features(&mut self, iter: impl IntoIterator<Item = SmolStr>) { | |||
| iter.into_iter().for_each(|feat| self.insert_key_value("feature".into(), feat)); | |||
| } | |||
|
|
|||
| /// Shortcut to set cfgs | |||
| pub fn insert_cfgs(&mut self, iter: impl IntoIterator<Item = SmolStr>) { | |||
There was a problem hiding this comment.
I think this does not belong here (and the above inseret_features probably as well) -- CfgOptions should a be pretty abstract thing, exactly what rustc sees.
Lowering various command-line args to this data structure should happen where we get the args.
|
Merging this as is, I'll fix up this myself (want to keep the number of open PR lower) bors r+ |
|
Build succeeded: |
Fixes #4238.