language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-28 10:39:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #19265 from Shourya742/2025-03-01-add-dangling-dyn-diagnostic

Browse source 
feat: Add diagnostic for dangling dyn and impl
This commit is contained in:
Laurențiu Nicola 2025-03-05 05:58:31 +00:00 • committed by GitHub
commit 3c394c61b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 102 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/syntax/src/validation.rs
View file

@ -37,6 +37,7 @@ pub(crate) fn validate(root: &SyntaxNode, errors: &mut Vec<SyntaxError>) {
ast::FnPtrType(it) => validate_trait_object_fn_ptr_ret_ty(it, errors),
ast::MacroRules(it) => validate_macro_rules(it, errors),
ast::LetExpr(it) => validate_let_expr(it, errors),
ast::ImplTraitType(it) => validate_impl_object_ty(it, errors),
_ => (),
}
}
@ -340,17 +341,34 @@ fn validate_trait_object_fn_ptr_ret_ty(ty: ast::FnPtrType, errors: &mut Vec<Synt
fn validate_trait_object_ty(ty: ast::DynTraitType) -> Option<SyntaxError> {
let tbl = ty.type_bound_list()?;
let bounds_count = tbl.bounds().count();
if tbl.bounds().count() > 1 {
let dyn_token = ty.dyn_token()?;
let potential_parenthesis =
algo::skip_trivia_token(dyn_token.prev_token()?, Direction::Prev)?;
let kind = potential_parenthesis.kind();
if !matches!(kind, T!['('] | T![<] | T![=]) {
return Some(SyntaxError::new("ambiguous `+` in a type", ty.syntax().text_range()));
match bounds_count {
0 => Some(SyntaxError::new(
"At least one trait is required for an object type",
ty.syntax().text_range(),
)),
_ if bounds_count > 1 => {
let dyn_token = ty.dyn_token()?;
let preceding_token =
algo::skip_trivia_token(dyn_token.prev_token()?, Direction::Prev)?;
if !matches!(preceding_token.kind(), T!['('] | T![<] | T![=]) {
return Some(SyntaxError::new("ambiguous `+` in a type", ty.syntax().text_range()));
}
None
}
_ => None,
}
}
fn validate_impl_object_ty(ty: ast::ImplTraitType, errors: &mut Vec<SyntaxError>) {
if ty.type_bound_list().map_or(0, |tbl| tbl.bounds().count()) == 0 {
errors.push(SyntaxError::new(
"At least one trait must be specified",
ty.syntax().text_range(),
));
}
None
}
fn validate_macro_rules(mac: ast::MacroRules, errors: &mut Vec<SyntaxError>) {