Skip to content

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Oct 14, 2025

Subtree update of rust-analyzer to rust-lang/rust-analyzer@6d4b234.

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

r? @ghost

A4-Tacks and others added 30 commits August 30, 2025 18:58
Example
---
```rust
fn main() {
    let bar = Some(true);
    if true && bar.$0
}
```

**Before this PR**:

Cannot complete `.let`

**After this PR**:

```rust
fn main() {
    let bar = Some(true);
    if true && let Some($0) = bar
}
```
Add support for else-block of never-type for `convert_to_guarded_return`

Example
---
```rust
fn main() {
    if$0 let Ok(x) = Err(92) {
        foo(x);
    } else {
        return
    }
}
```

**Before this PR**:

Assist not applicable

**After this PR**:

```rust
fn main() {
    let Ok(x) = Err(92) else {
        return
    };
    foo(x);
}
```
Example
---
```rust
fn foo() {
    let x;
    if true {
        match true {
            true => $0x = 2,
            false => x = 3,
        }
    }
}
```

**Before this PR**:

Assist not applicable

**After this PR**:

```rust
fn foo() {
    let x;
    if true {
        x = match true {
            true => 2,
            false => 3,
        };
    }
}
```
internal: Build x86_64-apple-darwin binaries on macos-14
internal: Migrate inference to next solver
…nresolved

fix: Ignore impl trait safety errors when the trait is unresolved
This updates the rust-version file to 3369e82.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 3369e82
Filtered ref: abf6c425d3a4688fd64d51be9adef24ec58e128b
Upstream diff: rust-lang/rust@f957826...3369e82

This merge was created using https://github.com/rust-lang/josh-sync.
Fix small things clippy was complaining about
…o-install

fix: Prevent rustup from automatically installing toolchains
ShoyuVanilla and others added 16 commits October 11, 2025 16:40
Fix not applicable c-str and byte-str for raw_string
Example
---
```rust
fn foo() -> bool {
    let$0 Some(x) = Some(2) else { return false };
}
```

**Before this PR**:

```rust
fn foo() -> bool {
    let Some(Some(x)) = Some(2) else { return };
}
```

**After this PR**:

Assist not applicable
…ist-else

Fix applicable on let-else for convert_to_guarded_return
Add else-block support for convert_to_guarded_return
…gn-up

Fix not applicable match inside if for pull_assignment_up
```rust
fn foo() -> i32 {
    loop {
        $0
    }
}
```

**Before this PR**:

```rust
fn foo() -> i32 {
    loop {
        break;
    }
}
```

**After this PR**:

```rust
fn foo() -> i32 {
    loop {
        break $0;
    }
}
```
This updates the rust-version file to fb24b04.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: fb24b04
Filtered ref: 8d328b994c70dfeed12717a13a915703ec939cfc
Upstream diff: rust-lang/rust@3369e82...fb24b04

This merge was created using https://github.com/rust-lang/josh-sync.
@rustbot
Copy link
Collaborator

rustbot commented Oct 14, 2025

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. labels Oct 14, 2025
@rust-log-analyzer

This comment has been minimized.

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 14, 2025
@rust-log-analyzer

This comment has been minimized.

@lnicola
Copy link
Member Author

lnicola commented Oct 14, 2025

@bors r+ p=1 subtree update

@bors
Copy link
Collaborator

bors commented Oct 14, 2025

📌 Commit 7d93599 has been approved by lnicola

It is now in the queue for this repository.

@bors bors 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 Oct 14, 2025
@bors
Copy link
Collaborator

bors commented Oct 14, 2025

⌛ Testing commit 7d93599 with merge 844264a...

bors added a commit that referenced this pull request Oct 14, 2025
`rust-analyzer` subtree update

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

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

r? `@ghost`
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.