fix: Use quote! inside ast::make::expr_call() - #22782
Conversation
rustbot
added
the
S-waiting-on-review
|
I'm not a fan of switching makers to |
|
I've seen this crash hit three users recently: so it's not a huge deal, but it does occur in real usage sometimes. Happy to close this PR if you don't think it's worthwhile. Alternatively, are there any ways I can check the |
Only manually via rust.ungram; that's the problem.
Both, although of course future drift is more problematic. |
|
Does it happen without invoking an assist manually? If yes, it's a bigger annoyance and there is more reason to merge this PR. |
|
Yep, they're passive: they're happening on |
0c67bfc to
3a45c77
Compare
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
|
I just added a link to the ungram code FWIW. |
|
Regarding usage of rust-analyzer/crates/syntax/src/ast/make.rs Lines 10 to 12 in 711ead6 |
|
You should not add a warning specifically in this function, rather in the module, and we already have it (in the docs for the
Yes, we should probably remove this. |
It's possible to make rust-analyzer panic because of `expr_from_text`
not roundtripping. Prefer `quote!`, which is better anyway (less work,
more robust).
This crash only seems to occur in rare circumstances, so I haven't
written a regression test. For reference, you can replicate it with
the following code:
mod serde {
pub struct Serializer;
pub trait Serialize {
fn serialize(&self, s: Serializer);
}
}
struct Duration;
impl serde::Serialize for Duration {
fn serialize(&self, s: serde::Serializer) {}
}
struct S {
map: <Duration
}
When the cursor was on `map`, the `generate_delegate_trait` would try
to build the call `<<Duration as Serialize>::serialize(&self.map, s)`.
Due to the extra leading `<`, we'd parse it as `<<`, which isn't valid
in an expression (left shift is an infix operator).
Since we were passing invalid Rust through the syntax builder, which
only allows valid Rust code, we then panicked.
18: 0x104007fdc - <core[eea836d19939cdd9]::option::Option<syntax[8d95e7771a925714]::ast::generated::nodes::Expr>>::unwrap
at /rustc/2d8144b7880597b6e6d3dfd63a9a9efae3f533d3/library/core/src/option.rs:1013:21
19: 0x104007fdc - <syntax[8d95e7771a925714]::Parse<syntax[8d95e7771a925714]::ast::generated::nodes::Expr>>::tree
at /Users/wilfred/src/rust-analyzer/crates/syntax/src/lib.rs:120:37
20: 0x104006014 - syntax[8d95e7771a925714]::ast::make::expr_from_text_with_edition::<syntax[8d95e7771a925714]::ast::generated::nodes::CallExpr>
at /Users/wilfred/src/rust-analyzer/crates/syntax/src/ast/make.rs:1360:28
21: 0x103ff9d80 - syntax[8d95e7771a925714]::ast::make::expr_from_text::<syntax[8d95e7771a925714]::ast::generated::nodes::CallExpr>
at /Users/wilfred/src/rust-analyzer/crates/syntax/src/ast/make.rs:1354:5
22: 0x103f8e298 - syntax[8d95e7771a925714]::ast::make::expr_call
at /Users/wilfred/src/rust-analyzer/crates/syntax/src/ast/make.rs:689:5
23: 0x103fed920 - <syntax[8d95e7771a925714]::ast::syntax_factory::SyntaxFactory>::expr_call
at /Users/wilfred/src/rust-analyzer/crates/syntax/src/ast/syntax_factory/constructors.rs:1157:19
24: 0x1027feb9c - ide_assists[84949edff2a7fc81]::handlers::generate_delegate_trait::func_assoc_item
at /Users/wilfred/src/rust-analyzer/crates/ide-assists/src/handlers/generate_delegate_trait.rs:796:22
25: 0x102800120 - ide_assists[84949edff2a7fc81]::handlers::generate_delegate_trait::process_assoc_item
AI disclosure: Written with help by GPT-5.5.
3a45c77 to
763669f
Compare
|
Reverted the comment change. |
rustbot
removed
the
S-waiting-on-review
3 participants
It's possible to make rust-analyzer panic because of
expr_from_textnot roundtripping. Preferquote!, which is better anyway (less work, more robust).This crash only seems to occur in rare circumstances, so I haven't written a regression test. For reference, you can replicate it with the following code:
When the cursor was on
map, thegenerate_delegate_traitwould try to build the call<<Duration as Serialize>::serialize(&self.map, s). Due to the extra leading<, we'd parse it as<<, which isn't valid in an expression (left shift is an infix operator).Since we were passing invalid Rust through the syntax builder, which only allows valid Rust code, we then panicked.
AI disclosure: Written with help by GPT-5.5.