Target modifiers fix for bool flags without value by azhogin · Pull Request #138483 · rust-lang/rust

azhogin · 2025-03-14T07:11:18Z

Fixed support of boolean flags without values: -Zbool-flag is now consistent with -Zbool-flag=true in another crate.

When flag is explicitly set to default value, target modifier will not be set in crate metainfo (-Zflag=false when false is a default value for the flag).

Improved error notification when target modifier flag is absent in a crate ("-Zflag unset").
Example:

note: `-Zreg-struct-return=true` in this crate is incompatible with unset `-Zreg-struct-return` in dependency `default_reg_struct_return`

rustbot · 2025-03-14T07:11:23Z

r? @fee1-dead

rustbot has assigned @fee1-dead.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

fee1-dead · 2025-03-15T07:44:51Z

tests/ui/target_modifiers/no_value_bool.error_explicit.stderr

+   | ^
+   |
+   = 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`


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

Added messages for cases when current crate has unset flag and when external crate has unset flag.

fee1-dead · 2025-03-15T07:45:38Z

compiler/rustc_session/src/options.rs

-                {
-                    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() };


would value.map_or_default(ToOwned::to_owned) work here?

Changed to map_or(...), looks like map_or_default is not yet merged for Option.

fee1-dead · 2025-03-15T07:46:27Z

tests/ui/target_modifiers/defaults_check.error.stderr

-   = 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`


this diagnostic is poor. it should be something like

Suggested change

= 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`

azhogin · 2025-03-18T04:27:22Z

@rustbot review

fee1-dead

LGTM, thanks!

fee1-dead · 2025-03-24T10:57:53Z

@bors r+

bors · 2025-03-24T10:57:56Z

📌 Commit 6ccaea1 has been approved by fee1-dead

It is now in the queue for this repository.

bors · 2025-03-24T10:57:57Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Rollup of 7 pull requests Successful merges: - rust-lang#138483 (Target modifiers fix for bool flags without value) - rust-lang#138818 (Don't produce debug information for compiler-introduced-vars when desugaring assignments.) - rust-lang#138898 (Mostly parser: Eliminate code that's been dead / semi-dead since the removal of type ascription syntax) - rust-lang#138930 (Add bootstrap step diff to CI job analysis) - rust-lang#138954 (Ensure `define_opaque` attrs are accounted for in HIR hash) - rust-lang#138959 (Revert "Make MatchPairTree::place non-optional") - rust-lang#138967 (Fix typo in error message) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#138483 - azhogin:azhogin/target-modifiers-bool-fix, r=fee1-dead Target modifiers fix for bool flags without value Fixed support of boolean flags without values: `-Zbool-flag` is now consistent with `-Zbool-flag=true` in another crate. When flag is explicitly set to default value, target modifier will not be set in crate metainfo (`-Zflag=false` when `false` is a default value for the flag). Improved error notification when target modifier flag is absent in a crate ("-Zflag unset"). Example: ``` note: `-Zreg-struct-return=true` in this crate is incompatible with unset `-Zreg-struct-return` in dependency `default_reg_struct_return` ```

…modificators, r=rcvalle Sanitizers target modificators Depends on bool flag fix: rust-lang#138483. Some sanitizers need to be target modifiers, and some do not. For now, we should mark all sanitizers as target modifiers except for these: AddressSanitizer, LeakSanitizer For kCFI, the helper flag -Zsanitizer-cfi-normalize-integers should also be a target modifier. Many test errors was with sanizer flags inconsistent with std deps. Tests are fixed with `-C unsafe-allow-abi-mismatch`.

…dificators, r=rcvalle Sanitizers target modificators Depends on bool flag fix: rust-lang#138483. Some sanitizers need to be target modifiers, and some do not. For now, we should mark all sanitizers as target modifiers except for these: AddressSanitizer, LeakSanitizer For kCFI, the helper flag -Zsanitizer-cfi-normalize-integers should also be a target modifier. Many test errors was with sanizer flags inconsistent with std deps. Tests are fixed with `-C unsafe-allow-abi-mismatch`.

…modificators, r=rcvalle Sanitizers target modificators Depends on bool flag fix: rust-lang#138483. Some sanitizers need to be target modifiers, and some do not. For now, we should mark all sanitizers as target modifiers except for these: AddressSanitizer, LeakSanitizer For kCFI, the helper flag -Zsanitizer-cfi-normalize-integers should also be a target modifier. Many test errors was with sanizer flags inconsistent with std deps. Tests are fixed with `-C unsafe-allow-abi-mismatch`.

…s, r=rcvalle Sanitizers target modificators Depends on bool flag fix: #138483. Some sanitizers need to be target modifiers, and some do not. For now, we should mark all sanitizers as target modifiers except for these: AddressSanitizer, LeakSanitizer For kCFI, the helper flag -Zsanitizer-cfi-normalize-integers should also be a target modifier. Many test errors was with sanizer flags inconsistent with std deps. Tests are fixed with `-C unsafe-allow-abi-mismatch`.

…s, r=rcvalle Sanitizers target modificators Depends on bool flag fix: rust-lang/rust#138483. Some sanitizers need to be target modifiers, and some do not. For now, we should mark all sanitizers as target modifiers except for these: AddressSanitizer, LeakSanitizer For kCFI, the helper flag -Zsanitizer-cfi-normalize-integers should also be a target modifier. Many test errors was with sanizer flags inconsistent with std deps. Tests are fixed with `-C unsafe-allow-abi-mismatch`.

…dificators, r=rcvalle Sanitizers target modificators Depends on bool flag fix: rust-lang#138483. Some sanitizers need to be target modifiers, and some do not. For now, we should mark all sanitizers as target modifiers except for these: AddressSanitizer, LeakSanitizer For kCFI, the helper flag -Zsanitizer-cfi-normalize-integers should also be a target modifier. Many test errors was with sanizer flags inconsistent with std deps. Tests are fixed with `-C unsafe-allow-abi-mismatch`.

…s, r=rcvalle Sanitizers target modificators Depends on bool flag fix: rust-lang/rust#138483. Some sanitizers need to be target modifiers, and some do not. For now, we should mark all sanitizers as target modifiers except for these: AddressSanitizer, LeakSanitizer For kCFI, the helper flag -Zsanitizer-cfi-normalize-integers should also be a target modifier. Many test errors was with sanizer flags inconsistent with std deps. Tests are fixed with `-C unsafe-allow-abi-mismatch`.

rustbot assigned fee1-dead Mar 14, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 14, 2025

This comment has been minimized.

Sign in to view

azhogin force-pushed the azhogin/target-modifiers-bool-fix branch from 908d92f to 080cbc2 Compare March 14, 2025 08:17

fee1-dead requested changes Mar 15, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 15, 2025

Target modifiers fix for bool flags without value

6ccaea1

azhogin force-pushed the azhogin/target-modifiers-bool-fix branch from 080cbc2 to 6ccaea1 Compare March 17, 2025 05:49

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 18, 2025

azhogin mentioned this pull request Mar 20, 2025

Sanitizers target modificators #138736

Merged

ojeda mentioned this pull request Mar 22, 2025

Rust unstable features needed for the kernel Rust-for-Linux/linux#2

Open

fee1-dead approved these changes Mar 24, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 24, 2025

Zalathar mentioned this pull request Mar 26, 2025

Rollup of 7 pull requests #138974

Merged

bors merged commit 7eb27a9 into rust-lang:master Mar 26, 2025
6 checks passed

rustbot added this to the 1.87.0 milestone Mar 26, 2025

	= 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`

Uh oh!

Conversation

azhogin commented Mar 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Mar 14, 2025

Uh oh!

This comment has been minimized.

fee1-dead Mar 15, 2025

Choose a reason for hiding this comment

Uh oh!

azhogin Mar 18, 2025

Choose a reason for hiding this comment

Uh oh!

fee1-dead Mar 15, 2025

Choose a reason for hiding this comment

Uh oh!

azhogin Mar 18, 2025

Choose a reason for hiding this comment

Uh oh!

fee1-dead Mar 15, 2025

Choose a reason for hiding this comment

Uh oh!

azhogin Mar 18, 2025

Choose a reason for hiding this comment

Uh oh!

azhogin commented Mar 18, 2025

Uh oh!

fee1-dead left a comment

Choose a reason for hiding this comment

Uh oh!

fee1-dead commented Mar 24, 2025

Uh oh!

bors commented Mar 24, 2025

Uh oh!

bors commented Mar 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

azhogin commented Mar 14, 2025 •

edited

Loading