rust-analyzer

diff --git a/crates/ide/src/hover/render.rs b/crates/ide/src/hover/render.rs
index 787b74fc62..5a51752266 100644
--- a/crates/ide/src/hover/render.rs
+++ b/crates/ide/src/hover/render.rs

@@ -497,7 +497,7 @@ fn render_notable_trait_comment(

let mut needs_impl_header = true;

for (trait_, assoc_types) in notable_traits {

desc.push_str(if mem::take(&mut needs_impl_header) {

- " // notable traits implemented: "

+ " // Implements notable traits: "

} else {

", "

});

@@ -530,6 +530,7 @@ fn type_info(

if let Some(res) = closure_ty(sema, config, &ty) {

return Some(res);

};

+ let db = sema.db;

let TypeInfo { original, adjusted } = ty;

let mut res = HoverResult::default();

let mut targets: Vec<hir::ModuleDef> = Vec::new();

@@ -538,29 +539,64 @@ fn type_info(

targets.push(item);

}

};

- walk_and_push_ty(sema.db, &original, &mut push_new_def);

- let mut desc = match render_notable_trait_comment(sema.db, &notable_traits(sema.db, &original))

- {

- Some(desc) => desc + "\n",

- None => String::new(),

- };

- desc += &if let Some(adjusted_ty) = adjusted {

- walk_and_push_ty(sema.db, &adjusted_ty, &mut push_new_def);

- let original = original.display(sema.db).to_string();

- let adjusted = adjusted_ty.display(sema.db).to_string();

+ walk_and_push_ty(db, &original, &mut push_new_def);

+ res.markup = if let Some(adjusted_ty) = adjusted {

+ walk_and_push_ty(db, &adjusted_ty, &mut push_new_def);

+ let notable = {

+ let mut desc = String::new();

+ let mut needs_impl_header = true;

+ for (trait_, assoc_types) in notable_traits(db, &original) {

+ desc.push_str(if mem::take(&mut needs_impl_header) {

+ "Implements Notable Traits: "

+ } else {

+ ", "

+ });

+ format_to!(desc, "{}", trait_.name(db).display(db),);

+ if !assoc_types.is_empty() {

+ desc.push('<');

+ format_to!(

+ desc,

+ "{}",

+ assoc_types.into_iter().format_with(", ", |(ty, name), f| {

+ f(&name.display(db))?;

+ f(&" = ")?;

+ match ty {

+ Some(ty) => f(&ty.display(db)),

+ None => f(&"?"),

+ }

+ })

+ );

+ desc.push('>');

+ }

+ if !desc.is_empty() {

+ desc.push('\n');

+ }

+ desc

+ };

+ let original = original.display(db).to_string();

+ let adjusted = adjusted_ty.display(db).to_string();

let static_text_diff_len = "Coerced to: ".len() - "Type: ".len();

format!(

- "```text\nType: {:>apad$}\nCoerced to: {:>opad$}\n```\n",

+ "```text\nType: {:>apad$}\nCoerced to: {:>opad$}\n{notable}```\n",

original,

adjusted,

apad = static_text_diff_len + adjusted.len().max(original.len()),

opad = original.len(),

)

+ .into()

} else {

- Markup::fenced_block(&original.display(sema.db)).into()

+ let mut desc = match render_notable_trait_comment(db, &notable_traits(db, &original)) {

+ Some(desc) => desc + "\n",

+ None => String::new(),

+ };

+ format_to!(desc, "{}", original.display(db));

+ Markup::fenced_block(&desc)

};

- res.markup = desc.into();

- if let Some(actions) = HoverAction::goto_type_from_targets(sema.db, targets) {

+ if let Some(actions) = HoverAction::goto_type_from_targets(db, targets) {

res.actions.push(actions);

}

Some(res)

diff --git a/crates/ide/src/hover/tests.rs b/crates/ide/src/hover/tests.rs
index d8d439c0d2..348308d710 100644
--- a/crates/ide/src/hover/tests.rs
+++ b/crates/ide/src/hover/tests.rs

@@ -7094,7 +7094,7 @@ fn main(notable$0: u32) {}

*notable*

```rust

- // notable traits implemented: Notable<Assoc = &str, Assoc2 = char>

+ // Implements notable traits: Notable<Assoc = &str, Assoc2 = char>

// size = 4, align = 4

notable: u32

```

@@ -7126,7 +7126,7 @@ impl Iterator for S {

```

```rust

- // notable traits implemented: Notable, Future<Output = u32>, Iterator<Item = S>

+ // Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S>

// size = 0, align = 1

struct S

```

@@ -7154,8 +7154,8 @@ fn main() {

}

"#,

expect![[r#"

- // notable traits implemented: Notable, Future<Output = u32>, Iterator<Item = S>

```rust

+ // Implements notable traits: Notable, Future<Output = u32>, Iterator<Item = S>

```"#]],

);

diff --git a/crates/load-cargo/src/lib.rs b/crates/load-cargo/src/lib.rs
index 8f02f20ad1..6c65e6a04f 100644
--- a/crates/load-cargo/src/lib.rs
+++ b/crates/load-cargo/src/lib.rs

@@ -318,7 +318,7 @@ fn load_crate_graph(

for task in receiver {

match task {

vfs::loader::Message::Progress { n_done, n_total, .. } => {

- if n_done == n_total {

+ if n_done == Some(n_total) {

break;

}

diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index b2cec1554c..6a073307c0 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs

@@ -589,19 +589,17 @@ impl GlobalState {

vfs::loader::Message::Progress { n_total, n_done, dir, config_version } => {

always!(config_version <= self.vfs_config_version);

+ let state = match n_done {

+ None => Progress::Begin,

+ Some(done) if done == n_total => Progress::End,

+ Some(_) => Progress::Report,

+ };

+ let n_done = n_done.unwrap_or_default();

self.vfs_progress_config_version = config_version;

self.vfs_progress_n_total = n_total;

self.vfs_progress_n_done = n_done;

- let state = if n_done == 0 {

- Progress::Begin

- } else if n_done < n_total {

- Progress::Report

- } else {

- assert_eq!(n_done, n_total);

- Progress::End

- };

let mut message = format!("{n_done}/{n_total}");

if let Some(dir) = dir {

message += &format!(

diff --git a/crates/vfs-notify/src/lib.rs b/crates/vfs-notify/src/lib.rs
index 00df1377c7..15a0ea5409 100644
--- a/crates/vfs-notify/src/lib.rs
+++ b/crates/vfs-notify/src/lib.rs

@@ -105,7 +105,7 @@ impl NotifyActor {

let n_total = config.load.len();

self.send(loader::Message::Progress {

n_total,

- n_done: 0,

+ n_done: None,

config_version,

dir: None,

});

@@ -120,14 +120,14 @@ impl NotifyActor {

let files =

self.load_entry(entry, watch, |file| loader::Message::Progress {

n_total,

- n_done: i,

+ n_done: Some(i),

dir: Some(file),

config_version,

});

self.send(loader::Message::Loaded { files });

self.send(loader::Message::Progress {

n_total,

- n_done: i + 1,

+ n_done: Some(i + 1),

config_version,

dir: None,

});

diff --git a/crates/vfs/src/loader.rs b/crates/vfs/src/loader.rs
index cdc94751df..e49849d230 100644
--- a/crates/vfs/src/loader.rs
+++ b/crates/vfs/src/loader.rs

@@ -52,7 +52,7 @@ pub enum Message {

/// The total files to be loaded.

n_total: usize,

/// The files that have been loaded successfully.

- n_done: usize,

+ n_done: Option<usize>,

/// The dir being loaded, `None` if its for a file.

dir: Option<AbsPathBuf>,

/// The [`Config`] version.