rust-analyzer

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 770652494f..0eb57a605f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml

@@ -56,8 +56,8 @@ jobs:

# Install a pinned rustc commit to avoid surprises

- name: Install Rust toolchain

run: |

- RUSTC_VERSION=`cat rust-version`

- rustup-toolchain-install-master ${RUSTC_VERSION} -c rust-src -c rustfmt

+ RUSTC_VERSION=$(cat rust-version)

+ rustup-toolchain-install-master ${RUSTC_VERSION} -c cargo -c rust-src -c rustfmt

rustup default ${RUSTC_VERSION}

# Emulate a nightly toolchain, because the toolchain installed above does not have "nightly"

@@ -98,9 +98,9 @@ jobs:

run: |

rustup update --no-self-update stable

rustup default stable

- rustup component add --toolchain stable rust-src clippy

- # We always use a nightly rustfmt, regardless of channel, because we need

- # --file-lines.

+ rustup component add --toolchain stable rust-src clippy rustfmt

+ # We also install a nightly rustfmt, because we use `--file-lines` in

+ # a test.

rustup toolchain install nightly --profile minimal --component rustfmt

# https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/rust.json

- name: Install Rust Problem Matcher

diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index 301d4cca06..e5c213ca93 100644
--- a/crates/hir-def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs

@@ -15,10 +15,6 @@ extern crate rustc_parse_format;

#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_parse_format as rustc_parse_format;

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_abi;

-#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_abi as rustc_abi;

pub mod db;

diff --git a/crates/hir-ty/src/lib.rs b/crates/hir-ty/src/lib.rs
index c2acfc4142..281cf6b2d4 100644
--- a/crates/hir-ty/src/lib.rs
+++ b/crates/hir-ty/src/lib.rs

@@ -3,45 +3,24 @@

#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_index;

+// FIXME: We used to import `rustc_*` deps from `rustc_private` with `feature = "in-rust-tree" but

+// temporarily switched to crates.io versions due to hardships that working on them from rustc

+// demands corresponding changes on rust-analyzer at the same time.

+// For details, see the zulip discussion below:

+// https://rust-lang.zulipchat.com/#narrow/channel/185405-t-compiler.2Frust-analyzer/topic/relying.20on.20in-tree.20.60rustc_type_ir.60.2F.60rustc_next_trait_solver.60/with/541055689

-#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_index as rustc_index;

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_abi;

-#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_abi as rustc_abi;

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_pattern_analysis;

-#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_pattern_analysis as rustc_pattern_analysis;

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_ast_ir;

-#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_ast_ir as rustc_ast_ir;

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_type_ir;

-#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_type_ir as rustc_type_ir;

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_next_trait_solver;

-#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_next_trait_solver as rustc_next_trait_solver;

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_data_structures as ena;

mod builder;

mod chalk_db;

mod chalk_ext;

diff --git a/crates/hir-ty/src/next_solver/consts.rs b/crates/hir-ty/src/next_solver/consts.rs
index 7ebefa76ed..0b3582051b 100644
--- a/crates/hir-ty/src/next_solver/consts.rs
+++ b/crates/hir-ty/src/next_solver/consts.rs

@@ -36,8 +36,6 @@ impl<'db> Const<'db> {

internee: kind,

flags: flags.flags,

outer_exclusive_binder: flags.outer_exclusive_binder,

- #[cfg(feature = "in-rust-tree")]

- stable_hash: ena::fingerprint::Fingerprint::ZERO,

};

Const::new_(interner.db(), InternedWrapperNoDebug(cached))

}

diff --git a/crates/hir-ty/src/next_solver/predicate.rs b/crates/hir-ty/src/next_solver/predicate.rs
index 8654541500..99b1354b63 100644
--- a/crates/hir-ty/src/next_solver/predicate.rs
+++ b/crates/hir-ty/src/next_solver/predicate.rs

@@ -227,8 +227,6 @@ impl<'db> Predicate<'db> {

internee: kind,

flags: flags.flags,

outer_exclusive_binder: flags.outer_exclusive_binder,

- #[cfg(feature = "in-rust-tree")]

- stable_hash: ena::fingerprint::Fingerprint::ZERO,

};

Predicate::new_(interner.db(), InternedWrapperNoDebug(cached))

}

diff --git a/crates/hir-ty/src/next_solver/ty.rs b/crates/hir-ty/src/next_solver/ty.rs
index 16bf082b01..a25996ab48 100644
--- a/crates/hir-ty/src/next_solver/ty.rs
+++ b/crates/hir-ty/src/next_solver/ty.rs

@@ -61,8 +61,6 @@ impl<'db> Ty<'db> {

internee: kind,

flags: flags.flags,

outer_exclusive_binder: flags.outer_exclusive_binder,

- #[cfg(feature = "in-rust-tree")]

- stable_hash: ena::fingerprint::Fingerprint::ZERO,

};

Ty::new_(interner.db(), InternedWrapperNoDebug(cached))

}

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 5592ca285f..93f6f6329e 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs

@@ -20,10 +20,6 @@

#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]

#![recursion_limit = "512"]

-#[cfg(feature = "in-rust-tree")]

-extern crate rustc_type_ir;

-#[cfg(not(feature = "in-rust-tree"))]

extern crate ra_ap_rustc_type_ir as rustc_type_ir;

mod attrs;

diff --git a/rust-version b/rust-version
index 02b217f7d8..8854fb9599 100644
--- a/rust-version
+++ b/rust-version

@@ -1 +1 @@

-21a19c297d4f5a03501d92ca251bd7a17073c08a

+caccb4d0368bd918ef6668af8e13834d07040417