Target modifiers fix for bool flags without value #138483
Conversation
|
r? @fee1-dead rustbot has assigned @fee1-dead. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
azhogin
force-pushed
the
azhogin/target-modifiers-bool-fix
branch
from
908d92f to
080cbc2
Compare
| | ^ | ||
| | | ||
| = help: the `-Zreg-struct-return` flag modifies the ABI so Rust crates compiled with different values of this flag cannot be used together safely | ||
| = note: `-Zreg-struct-return unset` in this crate is incompatible with `-Zreg-struct-return=true` in dependency `enabled_reg_struct_return` |
There was a problem hiding this comment.
This doesn't seem correct (unset in the backticks?), plus the string is untranslatable. I'd suggest adding a variant to the strings that explicitly says "unset" and use that
There was a problem hiding this comment.
Added messages for cases when current crate has unset flag and when external crate has unset flag.
| { | ||
| target_modifiers.insert(tmod, value.to_string()); | ||
| if let Some(tmod) = *tmod { | ||
| let v = if let Some(v) = value { v.to_string() } else { String::new() }; |
There was a problem hiding this comment.
would value.map_or_default(ToOwned::to_owned) work here?
There was a problem hiding this comment.
Changed to map_or(...), looks like map_or_default is not yet merged for Option.
| = note: `-Zreg-struct-return=true` in this crate is incompatible with `-Zreg-struct-return=` in dependency `default_reg_struct_return` | ||
| = help: set `-Zreg-struct-return=` in this crate or `-Zreg-struct-return=true` in `default_reg_struct_return` | ||
| = note: `-Zreg-struct-return=true` in this crate is incompatible with `-Zreg-struct-return unset` in dependency `default_reg_struct_return` | ||
| = help: set `-Zreg-struct-return unset` in this crate or `-Zreg-struct-return=true` in `default_reg_struct_return` |
There was a problem hiding this comment.
this diagnostic is poor. it should be something like
| = help: set `-Zreg-struct-return unset` in this crate or `-Zreg-struct-return=true` in `default_reg_struct_return` | |
| = help: unset `-Zreg-struct-return` in this crate or set `-Zreg-struct-return=true` in `default_reg_struct_return` |
rustbot
added
S-waiting-on-author
azhogin
force-pushed
the
azhogin/target-modifiers-bool-fix
branch
from
080cbc2 to
6ccaea1
Compare
|
@rustbot review |
rustbot
added
S-waiting-on-review
|
@bors r+ |
|
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened. |
bors
added
S-waiting-on-bors
Fixed support of boolean flags without values:
-Zbool-flagis now consistent with-Zbool-flag=truein another crate.When flag is explicitly set to default value, target modifier will not be set in crate metainfo (
-Zflag=falsewhenfalseis a default value for the flag).Improved error notification when target modifier flag is absent in a crate ("-Zflag unset").
Example: