rust-analyzer

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9f246098e7..ec3128d9ec 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml

@@ -86,6 +86,12 @@ jobs:

- name: Test

run: cargo test ${{ env.USE_SYSROOT_ABI }} -- --nocapture --quiet

+ - name: Switch to stable toolchain

+ run: |

+ rustup update --no-self-update stable

+ rustup component add --toolchain stable rust-src

+ rustup default stable

- name: Run analysis-stats on rust-analyzer

if: matrix.os == 'ubuntu-latest'

run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats .

diff --git a/Cargo.lock b/Cargo.lock
index 9e838fcc88..49e96236c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock

@@ -1196,9 +1196,9 @@ dependencies = [

[[package]]

name = "object"

-version = "0.31.1"

+version = "0.32.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"

+checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"

dependencies = [

"memchr",

]

@@ -1337,7 +1337,7 @@ name = "proc-macro-api"

version = "0.0.0"

dependencies = [

"memmap2",

- "object 0.31.1",

+ "object 0.32.0",

"paths",

"profile",

"serde",

@@ -1357,7 +1357,7 @@ dependencies = [

"libloading",

"mbe",

"memmap2",

- "object 0.31.1",

+ "object 0.32.0",

"paths",

"proc-macro-api",

"proc-macro-test",

diff --git a/crates/hir-ty/src/mir.rs b/crates/hir-ty/src/mir.rs
index 4723c25ed0..9be083d011 100644
--- a/crates/hir-ty/src/mir.rs
+++ b/crates/hir-ty/src/mir.rs

@@ -368,7 +368,7 @@ pub enum TerminatorKind {

///

/// Only permitted in cleanup blocks. `Resume` is not permitted with `-C unwind=abort` after

/// deaggregation runs.

- Resume,

+ UnwindResume,

/// Indicates that the landing pad is finished and that the process should abort.

///

@@ -1057,7 +1057,7 @@ impl MirBody {

TerminatorKind::FalseEdge { .. }

| TerminatorKind::FalseUnwind { .. }

| TerminatorKind::Goto { .. }

- | TerminatorKind::Resume

+ | TerminatorKind::UnwindResume

| TerminatorKind::GeneratorDrop

| TerminatorKind::Abort

| TerminatorKind::Return

diff --git a/crates/hir-ty/src/mir/borrowck.rs b/crates/hir-ty/src/mir/borrowck.rs
index ad98e8fa18..c70d7f63fd 100644
--- a/crates/hir-ty/src/mir/borrowck.rs
+++ b/crates/hir-ty/src/mir/borrowck.rs

@@ -160,7 +160,7 @@ fn moved_out_of_ref(db: &dyn HirDatabase, body: &MirBody) -> Vec<MovedOutOfRef>

TerminatorKind::FalseEdge { .. }

| TerminatorKind::FalseUnwind { .. }

| TerminatorKind::Goto { .. }

- | TerminatorKind::Resume

+ | TerminatorKind::UnwindResume

| TerminatorKind::GeneratorDrop

| TerminatorKind::Abort

| TerminatorKind::Return

@@ -280,7 +280,7 @@ fn ever_initialized_map(

let targets = match &terminator.kind {

TerminatorKind::Goto { target } => vec![*target],

TerminatorKind::SwitchInt { targets, .. } => targets.all_targets().to_vec(),

- TerminatorKind::Resume

+ TerminatorKind::UnwindResume

| TerminatorKind::Abort

| TerminatorKind::Return

| TerminatorKind::Unreachable => vec![],

@@ -371,7 +371,7 @@ fn mutability_of_locals(

};

match &terminator.kind {

TerminatorKind::Goto { .. }

- | TerminatorKind::Resume

+ | TerminatorKind::UnwindResume

| TerminatorKind::Abort

| TerminatorKind::Return

| TerminatorKind::Unreachable

diff --git a/crates/hir-ty/src/mir/monomorphization.rs b/crates/hir-ty/src/mir/monomorphization.rs
index c565228d91..df16d0d820 100644
--- a/crates/hir-ty/src/mir/monomorphization.rs
+++ b/crates/hir-ty/src/mir/monomorphization.rs

@@ -265,7 +265,7 @@ impl Filler<'_> {

self.fill_operand(discr)?;

}

TerminatorKind::Goto { .. }

- | TerminatorKind::Resume

+ | TerminatorKind::UnwindResume

| TerminatorKind::Abort

| TerminatorKind::Return

| TerminatorKind::Unreachable

diff --git a/crates/ide-completion/src/completions/attribute/cfg.rs b/crates/ide-completion/src/completions/attribute/cfg.rs
index 19bfd294b2..62bdb6ee68 100644
--- a/crates/ide-completion/src/completions/attribute/cfg.rs
+++ b/crates/ide-completion/src/completions/attribute/cfg.rs

@@ -42,10 +42,11 @@ pub(crate) fn complete_cfg(acc: &mut Completions, ctx: &CompletionContext<'_>) {

};

}

-const KNOWN_ARCH: [&str; 19] = [

+const KNOWN_ARCH: [&str; 20] = [

"aarch64",

"arm",

"avr",

+ "csky",

"hexagon",

"mips",

"mips64",

diff --git a/crates/ide-completion/src/completions/extern_abi.rs b/crates/ide-completion/src/completions/extern_abi.rs
index c717a9cb55..e411c1c869 100644
--- a/crates/ide-completion/src/completions/extern_abi.rs
+++ b/crates/ide-completion/src/completions/extern_abi.rs

@@ -30,6 +30,8 @@ const SUPPORTED_CALLING_CONVENTIONS: &[&str] = &[

"efiapi",

"avr-interrupt",

"avr-non-blocking-interrupt",

+ "riscv-interrupt-m",

+ "riscv-interrupt-s",

"C-cmse-nonsecure-call",

"wasm",

"system",

diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs
index e488300b41..49b37024a5 100644
--- a/crates/ide-db/src/generated/lints.rs
+++ b/crates/ide-db/src/generated/lints.rs

@@ -931,22 +931,6 @@ $ cat $(find -name '*.s')

"##,

Lint {

- label: "abi_thiscall",

- description: r##"# `abi_thiscall`

-The tracking issue for this feature is: [#42202]

-[#42202]: https://github.com/rust-lang/rust/issues/42202

-------------------------

-The MSVC ABI on x86 Windows uses the `thiscall` calling convention for C++

-instance methods by default; it is identical to the usual (C) calling

-convention on x86 Windows except that the first parameter of the method,

-the `this` pointer, is passed in the ECX register.

-"##,

- },

- Lint {

label: "allocator_api",

description: r##"# `allocator_api`

diff --git a/crates/proc-macro-api/Cargo.toml b/crates/proc-macro-api/Cargo.toml
index 4e39167136..4229f28913 100644
--- a/crates/proc-macro-api/Cargo.toml
+++ b/crates/proc-macro-api/Cargo.toml

@@ -12,7 +12,7 @@ rust-version.workspace = true

doctest = false

[dependencies]

-object = { version = "0.31.0", default-features = false, features = [

+object = { version = "0.32.0", default-features = false, features = [

"std",

"read_core",

"elf",

diff --git a/crates/proc-macro-srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml
index ecc6aaa0ac..99993f16e2 100644
--- a/crates/proc-macro-srv/Cargo.toml
+++ b/crates/proc-macro-srv/Cargo.toml

@@ -12,7 +12,7 @@ rust-version.workspace = true

doctest = false

[dependencies]

-object = { version = "0.31.0", default-features = false, features = [

+object = { version = "0.32.0", default-features = false, features = [

"std",

"read_core",

"elf",

diff --git a/crates/rust-analyzer/tests/slow-tests/main.rs b/crates/rust-analyzer/tests/slow-tests/main.rs
index 0bb29e7080..ed6ef47c8e 100644
--- a/crates/rust-analyzer/tests/slow-tests/main.rs
+++ b/crates/rust-analyzer/tests/slow-tests/main.rs

@@ -861,6 +861,7 @@ edition = "2021"

bar = {path = "../bar"}

//- /foo/src/main.rs

+#![allow(internal_features)]

#![feature(rustc_attrs, decl_macro)]

use bar::Bar;

@@ -938,7 +939,7 @@ pub fn foo(_input: TokenStream) -> TokenStream {

let res = server.send_request::<HoverRequest>(HoverParams {

text_document_position_params: TextDocumentPositionParams::new(

server.doc_id("foo/src/main.rs"),

- Position::new(11, 9),

+ Position::new(12, 9),

work_done_progress_params: Default::default(),

});