Rollup of 6 pull requests#152718
Closed
JonathanBrouwer wants to merge 157 commits intorust-lang:mainfrom
Closed
Conversation
Example
---
```rust
trait Trait {
fn f() -> Self;
}
struct Foo<'a>(&'a ());
impl<'a> Trait for Foo<'a> {
fn f() -> Self { Self(&()) }
}
impl Foo<'_> {
fn new() -> Self {
Self::$0f()
}
}
```
**Before this PR**
```rust
trait Trait {
fn f() -> Self;
}
struct Foo<'a>(&'a ());
impl<'a> Trait for Foo<'a> {
fn f() -> Self { Self(&()) }
}
impl Foo<'_> {
fn new() -> Self {
Foo<'a>(&())
}
}
```
**After this PR**
```rust
trait Trait {
fn f() -> Self;
}
struct Foo<'a>(&'a ());
impl<'a> Trait for Foo<'a> {
fn f() -> Self { Self(&()) }
}
impl Foo<'_> {
fn new() -> Self {
Foo(&())
}
}
```
Example
---
```rust
fn foo() {}
fn bar() {
let _ = [fo$0];
}
```
**Before this PR**
```rust
fn foo() {}
fn bar() {
let _ = [foo();$0];
}
```
**After this PR**
```rust
fn foo() {}
fn bar() {
let _ = [foo()$0];
}
```
This updates the rust-version file to 5a07626.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@5a07626 Filtered ref: rust-lang/miri@cc20862 Upstream diff: rust-lang/rust@d10ac47...5a07626 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
document guidelines for which shims have a place in Miri
This updates the rust-version file to 873d468.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@873d468 Filtered ref: rust-lang/miri@57f1e8b Upstream diff: rust-lang/rust@5a07626...873d468 This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
This updates the rust-version file to e96bb7e.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@e96bb7e Filtered ref: rust-lang/miri@4304ab0 Upstream diff: rust-lang/rust@873d468...e96bb7e This merge was created using https://github.com/rust-lang/josh-sync.
add a bug to the trophy shelf
Automatic Rustup
This updates the rust-version file to 35a31ba.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@35a31ba Filtered ref: rust-lang/miri@b436646 Upstream diff: rust-lang/rust@e96bb7e...35a31ba This merge was created using https://github.com/rust-lang/josh-sync.
Automatic Rustup
trophy case: oneshot data race
This updates the rust-version file to 878374e.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 878374e Filtered ref: a46a01d9de0d6a8cb834a0cc04b9156d61493c39 Upstream diff: rust-lang/rust@35a31ba...878374e This merge was created using https://github.com/rust-lang/josh-sync.
and reset MIRIFLAGS as well just to be safe
…r items that will resolve with the after segments
Contributor
Author
|
@bors r+ rollup=never p=5 |
Contributor
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 16, 2026
…uwer Rollup of 6 pull requests Successful merges: - #152700 (miri subtree update) - #152715 (`rust-analyzer` subtree update) - #152609 (Install LLVM DLL in the right place on Windows) - #152206 (misc doc improvements) - #152664 (Fix mis-constructed `file_span` when generating scraped examples) - #152698 (Suppress unstable-trait notes under `-Zforce-unstable-if-unmarked`)
Contributor
|
💔 Test for 497b932 failed: CI. Failed job:
|
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
Author
|
@bors retry |
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Feb 16, 2026
…uwer Rollup of 6 pull requests Successful merges: - #152700 (miri subtree update) - #152715 (`rust-analyzer` subtree update) - #152609 (Install LLVM DLL in the right place on Windows) - #152206 (misc doc improvements) - #152664 (Fix mis-constructed `file_span` when generating scraped examples) - #152698 (Suppress unstable-trait notes under `-Zforce-unstable-if-unmarked`)
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
💔 Test for 90e964b failed: CI. Failed job:
|
Contributor
|
☔ The latest upstream changes (presumably #152739) made this pull request unmergeable. Please resolve the merge conflicts. This pull request was unapproved. |
Contributor
Author
|
Failure is spurious, see #152609 (comment) |
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
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:
rust-analyzersubtree update #152715 (rust-analyzersubtree update)file_spanwhen generating scraped examples #152664 (Fix mis-constructedfile_spanwhen generating scraped examples)-Zforce-unstable-if-unmarked#152698 (Suppress unstable-trait notes under-Zforce-unstable-if-unmarked)r? @ghost
Create a similar rollup