Skip to content

rust-analyzer subtree update#156437

Merged
rust-bors[bot] merged 424 commits into
rust-lang:mainfrom
lnicola:sync-from-ra
May 11, 2026
Merged

rust-analyzer subtree update#156437
rust-bors[bot] merged 424 commits into
rust-lang:mainfrom
lnicola:sync-from-ra

Conversation

@lnicola
Copy link
Copy Markdown
Member

@lnicola lnicola commented May 11, 2026

Subtree update of rust-analyzer to rust-lang/rust-analyzer@e2a5867.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

ChayimFriedman2 and others added 30 commits April 29, 2026 01:28
…s back to source code

I'm not sure about the mapping the other way back, though - should we override them for the existing pattern?
Not sure why they regress, but the inserting of variables for parameters isn't that used anyway.
…iscompare

fix: use Pattern_White_Space for whitespace handling
Example
---
```rust
mod foo {
    pub struct OtherThing;
    pub struct RefCell<T>(T);
    impl<T> RefCell<T> {
        pub fn new(t: T) -> Self { RefCell(t) }
    }
}

fn main() {
    let thing: foo::RefCell<foo::OtherThing> = foo::OtherThing.$0;
}
```

**Before this PR**

```rust
fn main() {
    let thing: foo::RefCell<foo::OtherThing> = RefCell<OtherThing>::new(foo::OtherThing$0);
}
```

**After this PR**

```rust
fn main() {
    let thing: foo::RefCell<foo::OtherThing> = foo::RefCell::new(foo::OtherThing$0);
}
```
rustc uses this struct to store all information about an ADT, but we have other types and are mainly using it for the solver. So store only the information we need.
…-generate-function

Migrate generate function to SyntaxEditor
fix: qualify .new path and no complete generic params
There was a note in the docs that const blocks aren't visited, but most people don't read the docs and expect them to be visited. If you don't want them to, you can handle them specially.
So we can debug the test we have that gets stuck.
Example
---
```rust
fn main() {
    $0{
        92
    }
    ()
}
```

**Before this PR**

```rust
fn main() {
    92
    ()
}
```

**After this PR**

```rust
fn main() {
    92;
    ()
}
```
fix: add semicolon after expr in stmt for unwrap_branch
Example
---
```rust
fn main() {
    let s = cond.is_some().if$0;
}
```

**Before this PR**

```rust
fn main() {
    let s = if cond.is_some() {
        $0
    };
}
```

**After this PR**

```rust
fn main() {
    let s = if cond.is_some() {
        $1
    } else {
        $0
    };
}
```
…ine-call

internal: migrate `inline_call` assist to `SyntaxEditor`
…alue

feat: support if-else in value on postfix completions
internal: fix incorrect offset on multiple indel
MavenRain and others added 19 commits May 9, 2026 15:17
  Resolves a FIXME at hir-ty/src/infer/pat.rs that allowed
  record patterns like `let S { foo, foo } = ...;` to type-check
  with no error. Pushes the InferenceDiagnostic::DuplicateField
  variant (added in rust-lang/rust-analyzer#22235) at the pattern
  site; the cooked diagnostic already supports ExprOrPatId, so no
  plumbing changes are needed.

  Tests: struct pattern positive, enum variant pattern positive.

  Part of rust-lang/rust-analyzer#22140.

Signed-off-by: Onyeka Obi <softwareengineerasaservant@isurvivable.cv>
…ld-pat

ide-diagnostics: emit error for duplicate field in record pattern
…-derive-macro

Migrate derive macro to syntax editor
…-convert-closure-to-fn

migrate convert closure to fn to SyntaxEditor
…acro

fix: add whitespaces on postfix completion in macro
internal: Remove interning from query_group
internal: Refactor visiting and tracking of placeholder types
This updates the rust-version file to 8afb6a8.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 11, 2026
@lnicola
Copy link
Copy Markdown
Member Author

lnicola commented May 11, 2026

@bors r+ p=1

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 11, 2026

📌 Commit 9a0f4df has been approved by lnicola

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 11, 2026
rust-bors Bot pushed a commit that referenced this pull request May 11, 2026
…uwer

Rollup of 13 pull requests

Successful merges:

 - #156437 (`rust-analyzer` subtree update)
 - #156357 (tests: ip*_properties: avoid parsing the IP over and over again)
 - #156389 (prepare fs tests for miri)
 - #156147 (Update ICU4X to 2.2)
 - #156375 (kernel_copy tests: properly join background threads)
 - #156406 (resolve: Module-related refactorings)
 - #155946 (Refuse to push changes with a dirty git client)
 - #156282 (Update `sysinfo` version to `0.39.0`)
 - #156372 (remove allows_weak_linkage target spec flag)
 - #156384 (Remove some dead code for dumping MIR for a single DefId)
 - #156392 (Improve doc comments for f32::ceil() and f32::floor())
 - #156411 (bootstrap: Don't panic on `x install --set build.extended=true`)
 - #156426 (Fix unwanted "Available on XX-bit only" in libcore integers)
@rust-bors rust-bors Bot merged commit 1c7508d into rust-lang:main May 11, 2026
11 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 11, 2026
rust-timer added a commit that referenced this pull request May 11, 2026
Rollup merge of #156437 - lnicola:sync-from-ra, r=lnicola

`rust-analyzer` subtree update

Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@e2a5867.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost
@lnicola lnicola deleted the sync-from-ra branch May 11, 2026 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.