Rollup of 6 pull requests #123542
Closed
Rollup of 6 pull requests #123542
Conversation
This file contains 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
See also rust-lang#74465 (comment) Signed-off-by: tison <[email protected]>
This change applies to the following: - Handles `is_sorted` in the first iteration without needing a second. - Fixes line sorting on `--bless`. - Reads `issues.txt` as str rather than making it part of the source code. Signed-off-by: onur-ozkan <[email protected]>
impl get_mut_or_init and get_mut_or_try_init for OnceCell and OnceLock See also rust-lang#74465 (comment) I'm trying to understand the process for such proposal. And I'll appreciate it if anyone can guide me the next step for consensus or adding tests.
…ields, r=dtolnay Stabilize `const_caller_location` and `const_location_fields` Closes rust-lang#102911. Closes rust-lang#76156. tests: [library/core/tests/panic/location.rs](https://github.com/rust-lang/rust/blob/3521a2f2f317cb978063842485c7d1bc86ec82b6/library/core/tests/panic/location.rs) API: ```rust // core::panic::location impl Location { pub const fn caller() -> &'static Location<'static>; pub const fn file(&self) -> &str; pub const fn line(&self) -> u32; pub const fn column(&self) -> u32; } ```
…mulacrum Bump dependencies Follow up for rust-lang#123252 Unfortunately this file needs to be manually bumped when any dependencies are bumped in the main lockfile ``` Updating autocfg v1.1.0 -> v1.2.0 Updating chrono v0.4.35 -> v0.4.37 Updating clap v4.5.3 -> v4.5.4 Updating clap_derive v4.5.3 -> v4.5.4 Updating handlebars v5.1.0 -> v5.1.2 Updating itoa v1.0.10 -> v1.0.11 Updating memoffset v0.9.0 -> v0.9.1 Updating openssl-sys v0.9.101 -> v0.9.102 Updating pin-project-lite v0.2.13 -> v0.2.14 Updating r-efi v4.3.0 -> v4.4.0 Updating regex-syntax v0.8.2 -> v0.8.3 Updating security-framework v2.9.2 -> v2.10.0 Updating security-framework-sys v2.9.1 -> v2.10.0 Updating serde_json v1.0.114 -> v1.0.115 Updating syn v2.0.55 -> v2.0.57 Updating tokio v1.36.0 -> v1.37.0 ```
…Mark-Simulacrum optimize tidy check on `src/tools/tidy/src/issues.txt` This change applies to the following: - Handles `is_sorted` in the first iteration without needing a second. - Fixes line sorting on `--bless`. - Reads `issues.txt` as str rather than making it part of the source code. Fixes rust-lang#123002
…Simulacrum CI: Redirect stderr to stdout to order GHA logs This PR modifies the main CI workflow so that its stderr is redirected to stdout. This should make it so that stderr and stdout output is not interleaved in the wrong order in GHA logs (see discussion [here](https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Github.20actions.20logs.20show.20lines.20in.20the.20wrong.20order)).
…imulacrum bootstrap: split cargo-miri test into separate Step This makes it easier to test just the driver or the cargo-miri integration. ``@rust-lang/miri`` this means to test both you now need to do `./x.py test miri cargo-miri`.
|
@bors r+ rollup=never p=6 |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 6, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#114788 (impl get_mut_or_init and get_mut_or_try_init for OnceCell and OnceLock) - rust-lang#122291 (Stabilize `const_caller_location` and `const_location_fields`) - rust-lang#123321 (Bump dependencies) - rust-lang#123339 (optimize tidy check on `src/tools/tidy/src/issues.txt`) - rust-lang#123357 (CI: Redirect stderr to stdout to order GHA logs) - rust-lang#123504 (bootstrap: split cargo-miri test into separate Step) r? `@ghost` `@rustbot` modify labels: rollup
|
lets not rollup the dep update |
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:
const_caller_locationandconst_location_fields#122291 (Stabilizeconst_caller_locationandconst_location_fields)src/tools/tidy/src/issues.txt#123339 (optimize tidy check onsrc/tools/tidy/src/issues.txt)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup