Rollup of 4 pull requests #148270
Closed
Rollup of 4 pull requests #148270
+96 −24
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Co-Authored-By: Jeremy Soller <jackpot51@gmail.com>
This prevents a warning about ABI relevant target features not being set on x86 and arm. In addition it is required for miri to report correct features in is_*_feature_detected!() if miri switches to the dummy backend.
…ddle rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest` Context: rust-lang#133073, rust-lang#139224 (TL;DR: `libtest` has soft-deprecated `--nocapture` in favor a new & stable `--no-capture`; we should follow suit). Since the rustdoc flag is unstable (tracking issue: rust-lang#148116), we're allowed to remove the old flag immediately. However since the flag has existed for 4 years we could hard-deprecate the flag first or at least be considerate and provide a diagnostic referring users to the new flag. This PR does neither. Let me know what you would think would be best. Cargo doesn't use this flag, not yet at least (rust-lang/cargo#9705), so we really are free to sunset this flag without bigger consequences.
Couple of changes for Redox OS This upstreams all redox patches that can be upstreamed. cc `@jackpot51`
…triddle [rustdoc] Include attribute and derive macros when filtering on "macros" As discussed [here](rust-lang#147909), some filters should have been "grouped". This PR allows attribute and derive macros to match the `macro` filter. I'll wait for rust-lang#148005 to add more tests as it would require a proc-macro library for now. r? `@notriddle`
…es, r=JonathanBrouwer Handle default features and -Ctarget-features in the dummy backend This prevents a warning about ABI relevant target features not being set on x86 and arm. In addition it is required for miri to report correct features in is_*_feature_detected!() if miri switches to the dummy backend. Required for rust-lang/miri#4648
rustbot added A-run-make | @bors r+ rollup=never p=5 |
bors added S-waiting-on-bors bors added a commit that referenced this pull request Oct 30, 2025
Rollup of 4 pull requests Successful merges: - #148115 (rustdoc: Rename unstable option `--nocapture` to `--no-capture` in accordance with `libtest`) - #148137 (Couple of changes for Redox OS) - #148176 ([rustdoc] Include attribute and derive macros when filtering on "macros") - #148253 (Handle default features and -Ctarget-features in the dummy backend) r? `@ghost` `@rustbot` modify labels: rollup
| 💔 Test failed - checks-actions |
bors added S-waiting-on-review rustbot removed the S-waiting-on-review Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Successful merges:
--nocaptureto--no-capturein accordance withlibtest#148115 (rustdoc: Rename unstable option--nocaptureto--no-capturein accordance withlibtest)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup