Rollup of 11 pull requests#155061
Closed
JonathanBrouwer wants to merge 234 commits intorust-lang:mainfrom
Closed
Conversation
fix rust-lang/rust-analyzer#18578 I believe it won't break anything.
Example
---
```rust
trait Foo {
fn f(&self) -> i32;
fn foo(&self) -> i32 {
$0self.f()+self.f()$0
}
}
```
**Before this PR**
```rust
trait Foo {
fn f(&self) -> i32;
fn foo(&self) -> i32 {
fun_name(self)
}
}
fn $0fun_name(&self) -> i32 {
self.f()+self.f()
}
```
**After this PR**
```rust
trait Foo {
fn f(&self) -> i32;
fn foo(&self) -> i32 {
fun_name(self)
}
}
fn $0fun_name(this: &impl Foo) -> i32 {
this.f()+this.f()
}
```
We can't use the flycheck scope, because that value varies depending on how the flycheck was triggered. See also rust-lang/rust-analyzer#21571, which was reverted due to issues with scope. Instead, treat empty diagnostics as a flycheck for the entire workspace, add comments explaining the JSON diagnostic format, and add an integration test.
Example
---
```rust
trait Marker {
fn foo();
fn baz();
}
impl Marker for Foo {
fn foo() {}
fn missing() {}$0
fn baz() {}
}
```
**Before this PR**
```rust
trait Marker {
fn missing();
fn foo();
fn baz();
}
impl Marker for Foo {
fn foo() {}
fn missing() {}
fn baz() {}
}
```
**After this PR**
```rust
trait Marker {
fn foo();
fn missing();
fn baz();
}
impl Marker for Foo {
fn foo() {}
fn missing() {}
fn baz() {}
}
```
Example
---
```rust
struct Other;
struct String;
enum Foo {
String($0)
}
```
**Before this PR**
```text
en Foo Foo []
st Other Other []
sp Self Foo []
st String String []
```
**After this PR**
```text
st String String [name]
en Foo Foo []
st Other Other []
sp Self Foo []
```
Example
---
```rust
fn main() {
println!("{}", env!("CA$0"));
}
```
**Before this PR**
Cannot complete any env
**After this PR**
```rust
fn main() {
println!("{}", env!("CARGO_BIN_NAME"));
}
```
Example
---
Like `is_foo`, `.not`, `.if`
```rust
fn main() {
let is_foo = true;
!is_foo.$0
}
```
**Before this PR**
```rust
fn main() {
let is_foo = true;
!if is_foo {
$0
}
}
```
**After this PR**
```rust
fn main() {
let is_foo = true;
if !is_foo {
$0
}
}
```
Why? Because sometimes we work on resolving some bug that causes hang/consistent panics/stack overflows/etc., and we put it in a fixture for a test. Then r-a does exactly the same to us, and it's really hard to work this way.
feat: Allow disabling all fixture support
This updates the rust-version file to 80ad557.
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@80ad557 Filtered ref: rust-lang/rust-analyzer@7f4e321 Upstream diff: rust-lang/rust@1174f78...80ad557 This merge was created using https://github.com/rust-lang/josh-sync.
Rustc pull update
…hims These branches reused the libc::write error string when arguments were absent. Assisted by an AI coding tool (see CONTRIBUTING.md). Signed-off-by: Weixie Cui <cuiweixie@gmail.com>
…ng-args-messages fix: Correct missing-args messages for sched_getaffinity and getenv shims
For assist 'convert_to_guarded_return'
Example
---
```rust
fn main() -> i32 {
if$0 true {
foo();
} else {
bar()
}
}
```
**Before this PR**
Assist not applicable
**After this PR**
```rust
fn main() -> i32 {
if false {
return bar();
}
foo();
}
```
…davidtwco hwaddress: automatically add `-Ctarget-feature=+tagged-globals` Note that since HWAddressSanitizer is/should be a target modifier, we do not have to worry about whether this LLVM target feature changes the ABI. Fixes: rust-lang#148185
…O8Ki Add myself as co-maintainer for hexagon-unknown-linux-musl Two dedicated target maintainers are needed for tier 2 promotion. Coordinated with the existing maintainer r? @androm3da.
…3899, r=Kivooeo Add tests for three fixed issues (an LLVM crash, an ICE and poor codegen) Closes rust-lang#104037. Closes rust-lang#112623. Closes rust-lang#113899.
…lowering-ice, r=petrochenkov,fmease delegation: fix unelided lifetime ICE, refactoring of GenericArgPosition This PR does two things: - First it restores `lower_generic_args_of_path` as it was before rust-lang#151864, as it turns out we should use `GenericArgPosition::Type` for generic args lowering for signature inheritance, as it will not cause lifetime inference and then ICEs during child args lowering, - Next it refactors `GenericArgPosition` enum replacing `Value` and `MethodCall` with `Call(IsMethodCall)`, as the only place where we created `Value` or `MethodCall` variants was in `check_generic_arg_count_for_call`, where it was a match over `is_method_call`. Not sure it is needed, but seems cleaner to me. Fixes rust-lang#154178, part of rust-lang#118212. r? @petrochenkov
…thanBrouwer minor follow up to removing soft mode `#[unstable]` Follow up to rust-lang#153622 r? JonathanBrouwer
…adwinwhite Fix if branch in op.rs I removed the if guard without thinking in rust-lang#154223. Really sorry about this. r? @hkBst
rustbot
added
A-attributes
Contributor
Author
Contributor
rust-bors
bot
added
S-waiting-on-bors
Contributor
|
⌛ Trying commit e2e0b8e with merge 94774df… To cancel the try build, run the command Workflow: https://github.com/rust-lang/rust/actions/runs/24208640052 |
rust-bors bot
pushed a commit
that referenced
this pull request
Apr 9, 2026
Rollup of 11 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
rust-bors
bot
added
S-waiting-on-author
Contributor
|
PR #155031, which is a member of this rollup, was unapproved. This rollup was thus unapproved. |
Contributor
Author
|
@bors try cancel |
rustbot
removed
the
S-waiting-on-author
Contributor
|
Try build cancelled. Cancelled workflows: |
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
19 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:
rust-analyzersubtree update #155046 (rust-analyzersubtree update)#[diagnostic::on_unknown]attribute #152901 (Introduce a#[diagnostic::on_unknown]attribute)GenericTypeVisitablefor some types #155034 (ImplementGenericTypeVisitablefor some types)-Ctarget-feature=+tagged-globals#154677 (hwaddress: automatically add-Ctarget-feature=+tagged-globals)#[unstable]#155039 (minor follow up to removing soft mode#[unstable])r? @ghost
Create a similar rollup