Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 05:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17943 - Veykril:diags, r=Veykril

Browse source 
fix: Improve proc-macro panic message and workspace loading failure diagnostic
This commit is contained in:
bors 2024-08-22 16:47:56 +00:00
commit 9b724459b5
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -19,9 +19,10 @@ rowan.opt-level = 3
rustc-hash.opt-level = 3 rustc-hash.opt-level = 3
smol_str.opt-level = 3 smol_str.opt-level = 3
text-size.opt-level = 3 text-size.opt-level = 3
serde.opt-level = 3
salsa.opt-level = 3
# This speeds up `cargo xtask dist`. # This speeds up `cargo xtask dist`.
miniz_oxide.opt-level = 3 miniz_oxide.opt-level = 3
salsa.opt-level = 3
[profile.release] [profile.release]
incremental = true incremental = true

2
crates/hir-expand/src/lib.rs
View file

@ -192,7 +192,7 @@ impl ExpandErrorKind {
("overflow expanding the original macro".to_owned(), true) ("overflow expanding the original macro".to_owned(), true)
} }
ExpandErrorKind::Other(e) => ((**e).to_owned(), true), ExpandErrorKind::Other(e) => ((**e).to_owned(), true),
ExpandErrorKind::ProcMacroPanic(e) => ((**e).to_owned(), true), ExpandErrorKind::ProcMacroPanic(e) => (format!("proc-macro panicked: {e}"), true),
} }
} }
} }

2
crates/rust-analyzer/src/reload.rs
View file

@ -188,7 +188,7 @@ impl GlobalState {
status.health |= lsp_ext::Health::Warning; status.health |= lsp_ext::Health::Warning;
format_to!( format_to!(
message, message,
"Workspace `{}` has been queried without dependencies, connecting to crates.io might have failed.\n\n", "Failed to read Cargo metadata for `{}`, the `Cargo.toml` might be invalid or you have no internet connection.\n\n",
ws.manifest_or_root() ws.manifest_or_root()
); );
} }