Rollup of 10 pull requests #140376
Closed
Rollup of 10 pull requests #140376
+483
−41
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
nest under platform-specific behavior, factor rationale into its own section, and tweak language.
This will help with hiding some options in `--help`
This improves consistency with commonly expected CLI conventions, avoiding a common stutter people make when running tests (trying what they expect and then having to check the docs to then user whats accepted). An alternative could have been to take a value, like `--capture <value>` (e.g. `pytest` does this). Overall, we're shifting focus for features to custom test harnesses (see rust-lang#134283). Most of `pytest`s modes will likely be irrelevant in that situation. As for the rest, its too early to tell which, if any, may be relevant, so we're sticking with this small, quality of life improvement. By deprecating `--nocapture`, we intend that custom test harnesses do not need to support it for reasons outside of their own compatibility requirements, much like the deprecation in rust-lang#134283 I'm punting for now on the naming of `RUST_TEST_NOCAPTURE`. I feel like T-testing-devex should do a wider look at environment variables role in lib`test` before evaluating whether to - Deprecate it in favor of the user passing CLI flags or the test runner providing its own config - Deprecate in favor of `RUST_TEST_NO_CAPTURE` - Deprecate in favor of `RUST_TEST_CAPTURE` Other CLI flags were evaluated for casing consistency: - `--logfile` has the same problem but was deprecated in rust-lang#134283 Fixes rust-lang#133073
- Bump up the version to 5.2.0 Signed-off-by: Ayush Singh <[email protected]>
The def path printer in `get_def_path` essentially calls `Symbol::intern(&symbol.to_string())` for simple symbols in a path. This accounts for ~30% of the runtime of get_def_path. We can avoid this by simply appending the symbol directly when available.
This regression appeared in 916cfbc. The change is behaving as expected (a non-glob re-export uses the stability marker on the `use` item, not the original one), but this part of the standard library didn't follow it.
- Update r-efi to 5.2.0 Signed-off-by: Ayush Singh <[email protected]>
…homcc
Remove backticks from `ShouldPanic::YesWithMessage`'s `TrFailedMsg`
More legible imo
```rs
#[test]
#[should_panic = "love"]
fn foo() {
assert!(1 == 2);
}
```
Before:
```
note: panic did not contain expected string
panic message: `"assertion failed: 1 == 2"`,
expected substring: `"love"`
```
After:
```
note: panic did not contain expected string
panic message: "assertion failed: 1 == 2"
expected substring: "love"
```
Also removed the comma as `assert_eq!` / `assert_ne!` don't use one.
`@rustbot` label +A-libtest
…ulacrum Download GCC from CI on test builders This should reduce the duration of the `x86_64-gnu-llvm-18` job, which runs on PR CI, which is currently the only one that builds GCC (outside of the x64 dist builder). Since we handle the GCC download in the GCC step, and not eagerly in config, we can set this flag globally across all test builders, as it won't do anything unless they actually try to build GCC. Opening as a draft to test if it works on CI, because I still need to implement logic to avoid the download if there are any local modifications to GCC (essentially the "if-unchanged" mode, although I want to try something a bit different). r? `@ghost`
uefi: Update r-efi - Bump up the version to 5.2.0 try-job: x86_64-gnu-distcheck try-job: x86_64-gnu try-job: test-various
…oss35
Add `Arc::is_unique`
Adds
```rs
impl<T> Arc<T> {
pub fn is_unique(this: &Self) -> bool;
}
```
Tracking issue: rust-lang#138938
ACP: rust-lang/libs-team#560
fix(test): Expose '--no-capture' in favor of `--nocapture` This improves consistency with commonly expected CLI conventions, avoiding a common stutter people make when running tests (trying what they expect and then having to check the docs to then user whats accepted). An alternative could have been to take a value, like `--capture <value>` (e.g. `pytest` does this). Overall, we're shifting focus for features to custom test harnesses (see rust-lang#134283). Most of `pytest`s modes will likely be irrelevant in that situation. As for the rest, its too early to tell which, if any, may be relevant, so we're sticking with this small, quality of life improvement. I expect we'll warn about `--nocapture` being deprecated in the future after a sufficient transition period has been allowed. By deprecating `--nocapture`, we intend that custom test harnesses do not need to support it for reasons outside of their own compatibility requirements, much like the deprecation in rust-lang#134283 I'm punting for now on the naming of `RUST_TEST_NOCAPTURE`. I feel like T-testing-devex should do a wider look at environment variables role in lib`test` before evaluating whether to - Deprecate it in favor of the user passing CLI flags or the test runner providing its own config - Deprecate in favor of `RUST_TEST_NO_CAPTURE` - Deprecate in favor of `RUST_TEST_CAPTURE` Other CLI flags were evaluated for casing consistency: - `--logfile` has the same problem but was deprecated in rust-lang#134283 Regarding the implementation, I moved `--nocapture` out of `optgroups()`, into `parse_opts()`, out of an abundance of caution in passing the options without a deprecated value to the usage generation. However, the usage does not actually show optional flags, so this could potentially be dropped, simplifying the PR. Note: `compiletest` added `--no-capture` instead of `--nocapture` in rust-lang#134809 T-testing-devex FCP: rust-lang#133073 (comment) Fixes rust-lang#133073
…5942, r=thomcc std(docs): clarify how std::fs::set_permisions works with symlinks fixes rust-lang#75942 fixes rust-lang#124201
…Simulacrum crashes: more tests try-job: aarch64-apple try-job: x86_64-msvc-1 try-job: x86_64-gnu try-job: dist-i586-gnu-i586-i686-musl
Avoid re-interning in `LateContext::get_def_path` The def path printer in `get_def_path` essentially calls `Symbol::intern(&symbol.to_string())` for simple symbols in a path. This accounts for ~30% of the runtime of get_def_path. We can avoid this by simply appending the symbol directly when available.
… r=thomcc
docs: fix incorrect stability markers on `std::{todo, matches}`
This regression appeared in 916cfbc. The change is behaving as expected (a non-glob re-export uses the stability marker on the `use` item, not the original one), but this part of the standard library didn't follow it.
Fixes rust-lang#140344
specify explicit safety guidance for from_utf8_unchecked The PR addresses missing safety guidelines in two APIs by adding explicit text to the cross-linked reference.
rustbot
added
A-testsuite
|
@bors r+ rollup=never p=5 |
bors
added
S-waiting-on-bors
|
The job Click to see the possible cause of the failure (guessed by this bot) |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 28, 2025
…enton Rollup of 10 pull requests Successful merges: - rust-lang#136160 (Remove backticks from `ShouldPanic::YesWithMessage`'s `TrFailedMsg`) - rust-lang#138395 (Download GCC from CI on test builders) - rust-lang#138737 (uefi: Update r-efi) - rust-lang#138939 (Add `Arc::is_unique`) - rust-lang#139224 (fix(test): Expose '--no-capture' in favor of `--nocapture`) - rust-lang#139546 (std(docs): clarify how std::fs::set_permisions works with symlinks) - rust-lang#139883 (crashes: more tests) - rust-lang#140345 (Avoid re-interning in `LateContext::get_def_path`) - rust-lang#140351 (docs: fix incorrect stability markers on `std::{todo, matches}`) - rust-lang#140359 (specify explicit safety guidance for from_utf8_unchecked) r? `@ghost` `@rustbot` modify labels: rollup
|
@bors r- |
bors
added
S-waiting-on-author
|
@bors retry |
bors
added
S-waiting-on-bors
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
ShouldPanic::YesWithMessage'sTrFailedMsg#136160 (Remove backticks fromShouldPanic::YesWithMessage'sTrFailedMsg)Arc::is_unique#138939 (AddArc::is_unique)--nocapture#139224 (fix(test): Expose '--no-capture' in favor of--nocapture)LateContext::get_def_path#140345 (Avoid re-interning inLateContext::get_def_path)std::{todo, matches}#140351 (docs: fix incorrect stability markers onstd::{todo, matches})r? @ghost
@rustbot modify labels: rollup
Create a similar rollup