rust-analyzer

diff --git a/crates/hir/src/semantics/source_to_def.rs b/crates/hir/src/semantics/source_to_def.rs
index ba9a1cfb6b..87e22c2138 100644
--- a/crates/hir/src/semantics/source_to_def.rs
+++ b/crates/hir/src/semantics/source_to_def.rs

@@ -115,7 +115,7 @@ pub(super) struct SourceToDefCtx<'a, 'b> {

}

impl SourceToDefCtx<'_, '_> {

- pub(super) fn file_to_def(&mut self, file: FileId) -> SmallVec<[ModuleId; 1]> {

+ pub(super) fn file_to_def(&self, file: FileId) -> SmallVec<[ModuleId; 1]> {

let _p = profile::span("SourceBinder::to_module_def");

let mut mods = SmallVec::new();

for &crate_id in self.db.relevant_crates(file).iter() {

@@ -130,7 +130,7 @@ impl SourceToDefCtx<'_, '_> {

mods

}

- pub(super) fn module_to_def(&mut self, src: InFile<ast::Module>) -> Option<ModuleId> {

+ pub(super) fn module_to_def(&self, src: InFile<ast::Module>) -> Option<ModuleId> {

let _p = profile::span("module_to_def");

let parent_declaration = src

.syntax()

@@ -151,7 +151,7 @@ impl SourceToDefCtx<'_, '_> {

Some(def_map.module_id(child_id))

}

- pub(super) fn source_file_to_def(&mut self, src: InFile<ast::SourceFile>) -> Option<ModuleId> {

+ pub(super) fn source_file_to_def(&self, src: InFile<ast::SourceFile>) -> Option<ModuleId> {

let _p = profile::span("source_file_to_def");

let file_id = src.file_id.original_file(self.db.upcast());

self.file_to_def(file_id).get(0).copied()

diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs
index 9395e914c4..e7d0a8be7f 100644
--- a/crates/ide/src/syntax_highlighting/highlight.rs
+++ b/crates/ide/src/syntax_highlighting/highlight.rs

@@ -87,9 +87,9 @@ fn punctuation(

let parent = token.parent();

let parent_kind = parent.as_ref().map_or(EOF, SyntaxNode::kind);

match (kind, parent_kind) {

- (T![?], _) => HlTag::Operator(HlOperator::Other) | HlMod::ControlFlow,

+ (T![?], TRY_EXPR) => HlTag::Operator(HlOperator::Other) | HlMod::ControlFlow,

(T![&], BIN_EXPR) => HlOperator::Bitwise.into(),

- (T![&], _) => {

+ (T![&], REF_EXPR) => {

let h = HlTag::Operator(HlOperator::Other).into();

let is_unsafe = parent

.and_then(ast::RefExpr::cast)

@@ -100,7 +100,9 @@ fn punctuation(

}

- (T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.], _) => HlOperator::Other.into(),

+ (T![::] | T![->] | T![=>] | T![..] | T![..=] | T![=] | T![@] | T![.], _) => {

+ HlOperator::Other.into()

+ }

(T![!], MACRO_CALL | MACRO_RULES) => HlPunct::MacroBang.into(),

(T![!], NEVER_TYPE) => HlTag::BuiltinType.into(),

(T![!], PREFIX_EXPR) => HlOperator::Logical.into(),

@@ -129,7 +131,7 @@ fn punctuation(

(T![+=] | T![-=] | T![*=] | T![/=] | T![%=], BIN_EXPR) => {

Highlight::from(HlOperator::Arithmetic) | HlMod::Mutable

}

- (T![|] | T![&] | T![!] | T![^] | T![>>] | T![<<], BIN_EXPR) => HlOperator::Bitwise.into(),

+ (T![|] | T![&] | T![^] | T![>>] | T![<<], BIN_EXPR) => HlOperator::Bitwise.into(),

(T![|=] | T![&=] | T![^=] | T![>>=] | T![<<=], BIN_EXPR) => {

Highlight::from(HlOperator::Bitwise) | HlMod::Mutable

}

@@ -137,7 +139,6 @@ fn punctuation(

(T![>] | T![<] | T![==] | T![>=] | T![<=] | T![!=], BIN_EXPR) => {

HlOperator::Comparison.into()

}

- (_, PREFIX_EXPR | BIN_EXPR | RANGE_EXPR | RANGE_PAT | REST_PAT) => HlOperator::Other.into(),

(_, ATTR) => HlTag::AttributeBracket.into(),

(kind, _) => match kind {

T!['['] | T![']'] => HlPunct::Bracket,

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html b/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html
index e07fd3925c..9ed65fbc85 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_assoc_functions.html

@@ -48,15 +48,15 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

impl foo {

pub fn is_static() {}

- pub fn is_not_static(&self) {}

+ pub fn is_not_static(&self) {}

}

trait t {

fn t_is_static() {}

- fn t_is_not_static(&self) {}

+ fn t_is_not_static(&self) {}

}

impl t for foo {

pub fn is_static() {}

- pub fn is_not_static(&self) {}

+ pub fn is_not_static(&self) {}

}</code></pre> \ No newline at end of file

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
index eef5baea98..18045f1f55 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html

@@ -125,7 +125,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

/// ```sh

/// echo 1

/// ```

- pub fn foo(&self) -> bool {

+ pub fn foo(&self) -> bool {

true

}

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
index a97802cbbd..9f2b1926b5 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html

@@ -61,11 +61,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

}

trait Bar {

- fn bar(&self) -> i32;

+ fn bar(&self) -> i32;

}

impl Bar for Foo {

self.x

}

@@ -75,11 +75,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

f.baz(self)

}

- fn qux(&mut self) {

+ fn qux(&mut self) {

self.x = 0;

}

- fn quop(&self) -> i32 {

+ fn quop(&self) -> i32 {

self.x

}

@@ -96,11 +96,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

f.baz(self)

}

self.x

}

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
index ced7d22f03..abcd80c280 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html

@@ -42,7 +42,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }

</style>

-<pre><code>fn fixture(ra_fixture: &str) {}

+<pre><code>fn fixture(ra_fixture: &str) {}

fn main() {

fixture(r#"

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html b/crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html
index 2d85fc8c92..f98e0b1cda 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html

@@ -45,8 +45,8 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

#[derive()]

struct Foo<'a, 'b, 'c> where 'a: 'a, 'static: 'static {

- field: &'a (),

- field2: &'static (),

+ field: &'a (),

+ field2: &'static (),

}

impl<'a> Foo<'_, 'a, 'static>

where

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
index c627bc9b09..a626cda3fe 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html

@@ -62,16 +62,16 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

() => (

),

- ($msg:literal $(,)?) => (

+ ($msg:literal $(,)?) => (

),

// Use `panic_str` instead of `panic_display::<&str>` for non_fmt_panic lint.

- ($msg:expr $(,)?) => (

+ ($msg:expr $(,)?) => (

),

// Special-case the single-argument case for const_panic.

- ("{}", $arg:expr $(,)?) => (

- $crate::panicking::panic_display(&$arg)

+ ("{}", $arg:expr $(,)?) => (

+ $crate::panicking::panic_display(&$arg)

),

($fmt:expr, $($arg:tt)+) => (

$crate::panicking::panic_fmt($crate::const_format_args!($fmt, $($arg)+))

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
index 0716bae751..1992bdc6ae 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html

@@ -49,7 +49,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

}

macro_rules! unsafe_deref {

() => {

- *(&() as *const ())

+ *(&() as *const ())

};

}

static mut MUT_GLOBAL: Struct = Struct { field: 0 };

@@ -63,7 +63,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

struct Struct { field: i32 }

impl Struct {

- unsafe fn unsafe_method(&self) {}

+ unsafe fn unsafe_method(&self) {}

}

#[repr(packed)]

@@ -78,11 +78,11 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

fn unsafe_trait_bound<T: UnsafeTrait>(_: T) {}

trait DoTheAutoref {

- fn calls_autoref(&self);

+ fn calls_autoref(&self);

}

impl DoTheAutoref for u16 {

}

fn main() {

diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
index c749a3b656..2c0af99940 100644
--- a/crates/project-model/src/workspace.rs
+++ b/crates/project-model/src/workspace.rs

@@ -21,8 +21,8 @@ use crate::{

cfg_flag::CfgFlag,

rustc_cfg,

sysroot::SysrootCrate,

- utf8_stdout, CargoConfig, CargoWorkspace, ManifestPath, ProjectJson, ProjectManifest, Sysroot,

- TargetKind, WorkspaceBuildScripts,

+ utf8_stdout, CargoConfig, CargoWorkspace, ManifestPath, Package, ProjectJson, ProjectManifest,

+ Sysroot, TargetKind, WorkspaceBuildScripts,

};

/// A set of cfg-overrides per crate.

@@ -315,6 +315,13 @@ impl ProjectWorkspace {

/// The return type contains the path and whether or not

/// the root is a member of the current workspace

pub fn to_roots(&self) -> Vec<PackageRoot> {

+ let mk_sysroot = |sysroot: Option<&Sysroot>| {

+ sysroot.map(|sysroot| PackageRoot {

+ is_local: false,

+ include: vec![sysroot.src_root().to_path_buf()],

+ exclude: Vec::new(),

+ })

+ };

match self {

ProjectWorkspace::Json { project, sysroot, rustc_cfg: _ } => project

.crates()

@@ -325,13 +332,7 @@ impl ProjectWorkspace {

})

.collect::<FxHashSet<_>>()

.into_iter()

- .chain(sysroot.as_ref().into_iter().flat_map(|sysroot| {

- sysroot.crates().map(move |krate| PackageRoot {

- is_local: false,

- include: vec![sysroot[krate].root.parent().to_path_buf()],

- exclude: Vec::new(),

- })

- }))

+ .chain(mk_sysroot(sysroot.as_ref()))

.collect::<Vec<_>>(),

ProjectWorkspace::Cargo {

cargo,

@@ -380,11 +381,7 @@ impl ProjectWorkspace {

}

PackageRoot { is_local, include, exclude }

})

- .chain(sysroot.iter().map(|sysroot| PackageRoot {

- is_local: false,

- include: vec![sysroot.src_root().to_path_buf()],

- exclude: Vec::new(),

- }))

+ .chain(mk_sysroot(sysroot.as_ref()))

.chain(rustc.iter().flat_map(|rustc| {

rustc.packages().map(move |krate| PackageRoot {

is_local: false,

@@ -401,11 +398,7 @@ impl ProjectWorkspace {

include: vec![detached_file.clone()],

exclude: Vec::new(),

})

- .chain(sysroot.crates().map(|krate| PackageRoot {

- is_local: false,

- include: vec![sysroot[krate].root.parent().to_path_buf()],

- exclude: Vec::new(),

- }))

+ .chain(mk_sysroot(Some(sysroot)))

.collect(),

}

@@ -639,6 +632,8 @@ fn cargo_to_crate_graph(

lib_tgt = Some((crate_id, cargo[tgt].name.clone()));

pkg_to_lib_crate.insert(pkg, crate_id);

}

+ // Even crates that don't set proc-macro = true are allowed to depend on proc_macro

+ // (just none of the APIs work when called outside of a proc macro).

if let Some(proc_macro) = libproc_macro {

add_dep_with_prelude(

&mut crate_graph,

@@ -654,19 +649,19 @@ fn cargo_to_crate_graph(

}

// Set deps to the core, std and to the lib target of the current package

- for (from, kind) in pkg_crates.get(&pkg).into_iter().flatten() {

+ for &(from, kind) in pkg_crates.get(&pkg).into_iter().flatten() {

// Add sysroot deps first so that a lib target named `core` etc. can overwrite them.

- public_deps.add(*from, &mut crate_graph);

+ public_deps.add(from, &mut crate_graph);

if let Some((to, name)) = lib_tgt.clone() {

- if to != *from && *kind != TargetKind::BuildScript {

+ if to != from && kind != TargetKind::BuildScript {

// (build script can not depend on its library target)

// For root projects with dashes in their name,

// cargo metadata does not do any normalization,

// so we do it ourselves currently

let name = CrateName::normalize_dashes(&name);

- add_dep(&mut crate_graph, *from, name, to);

+ add_dep(&mut crate_graph, from, name, to);

}

@@ -678,17 +673,17 @@ fn cargo_to_crate_graph(

for dep in cargo[pkg].dependencies.iter() {

let name = CrateName::new(&dep.name).unwrap();

if let Some(&to) = pkg_to_lib_crate.get(&dep.pkg) {

- for (from, kind) in pkg_crates.get(&pkg).into_iter().flatten() {

- if dep.kind == DepKind::Build && *kind != TargetKind::BuildScript {

+ for &(from, kind) in pkg_crates.get(&pkg).into_iter().flatten() {

+ if dep.kind == DepKind::Build && kind != TargetKind::BuildScript {

// Only build scripts may depend on build dependencies.

continue;

}

- if dep.kind != DepKind::Build && *kind == TargetKind::BuildScript {

+ if dep.kind != DepKind::Build && kind == TargetKind::BuildScript {

// Build scripts may only depend on build dependencies.

continue;

}

- add_dep(&mut crate_graph, *from, name.clone(), to)

+ add_dep(&mut crate_graph, from, name.clone(), to)

}

@@ -699,9 +694,9 @@ fn cargo_to_crate_graph(

// and create dependencies on them for the crates which opt-in to that

if let Some(rustc_workspace) = rustc {

handle_rustc_crates(

+ &mut crate_graph,

rustc_workspace,

load,

- &mut crate_graph,

&cfg_options,

override_cfg,

load_proc_macro,

@@ -761,16 +756,16 @@ fn detached_files_to_crate_graph(

}

fn handle_rustc_crates(

+ crate_graph: &mut CrateGraph,

rustc_workspace: &CargoWorkspace,

load: &mut dyn FnMut(&AbsPath) -> Option<FileId>,

- crate_graph: &mut CrateGraph,

cfg_options: &CfgOptions,

override_cfg: &CfgOverrides,

load_proc_macro: &mut dyn FnMut(&str, &AbsPath) -> ProcMacroLoadResult,

- pkg_to_lib_crate: &mut FxHashMap<la_arena::Idx<crate::PackageData>, CrateId>,

+ pkg_to_lib_crate: &mut FxHashMap<Package, CrateId>,

public_deps: &SysrootPublicDeps,

cargo: &CargoWorkspace,

- pkg_crates: &FxHashMap<la_arena::Idx<crate::PackageData>, Vec<(CrateId, TargetKind)>>,

+ pkg_crates: &FxHashMap<Package, Vec<(CrateId, TargetKind)>>,

build_scripts: &WorkspaceBuildScripts,

) {

let mut rustc_pkg_crates = FxHashMap::default();

@@ -784,8 +779,8 @@ fn handle_rustc_crates(

let mut queue = VecDeque::new();

queue.push_back(root_pkg);

while let Some(pkg) = queue.pop_front() {

- // Don't duplicate packages if they are dependended on a diamond pattern

- // N.B. if this line is omitted, we try to analyse over 4_800_000 crates

+ // Don't duplicate packages if they are dependent on a diamond pattern

+ // N.B. if this line is omitted, we try to analyze over 4_800_000 crates

// which is not ideal

if rustc_pkg_crates.contains_key(&pkg) {

continue;