language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 13:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #19511 from snprajwal/fixmes

Browse source 
chore: clean up some FIXMEs
This commit is contained in:
Lukas Wirth 2025-04-07 10:30:46 +00:00 • committed by GitHub
commit 33c3f67764
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 36 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/mbe/src/expander/transcriber.rs
View file

@ -210,8 +210,11 @@ fn expand_subtree(
}
Op::Ignore { name, id } => {
// Expand the variable, but ignore the result. This registers the repetition count.
// FIXME: Any emitted errors are dropped.
let _ = ctx.bindings.get_fragment(name, *id, &mut ctx.nesting, marker);
let e = ctx.bindings.get_fragment(name, *id, &mut ctx.nesting, marker).err();
// FIXME: The error gets dropped if there were any previous errors.
// This should be reworked in a way where the errors can be combined
// and reported rather than storing the first error encountered.
err = err.or(e);
}
Op::Index { depth } => {
let index =
@ -239,9 +242,7 @@ fn expand_subtree(
let mut binding = match ctx.bindings.get(name, ctx.call_site) {
Ok(b) => b,
Err(e) => {
if err.is_none() {
err = Some(e);
}
err = err.or(Some(e));
continue;
}
};