rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Replace kw_span by full span.

Browse Source
This commit is contained in:
Camille GILLOT
2024-07-02 09:38:49 +00:00
parent 6268d0aa34
commit 3380bfd1a0
13 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_parse/src/parser/generics.rs
View File

@@ -114,13 +114,18 @@ impl<'a> Parser<'a> {
// Parse optional const generics default value.
let default = if self.eat(exp!(Eq)) { Some(self.parse_const_arg()?) } else { None };
let span = if let Some(ref default) = default {
const_span.to(default.value.span)
} else {
const_span.to(ty.span)
};
Ok(GenericParam {
ident,
id: ast::DUMMY_NODE_ID,
attrs: preceding_attrs,
bounds: Vec::new(),
kind: GenericParamKind::Const { ty, kw_span: const_span, default },
kind: GenericParamKind::Const { ty, span, default },
is_placeholder: false,
colon_span: None,
})
@@ -137,6 +142,11 @@ impl<'a> Parser<'a> {
// Parse optional const generics default value.
let default = if self.eat(exp!(Eq)) { Some(self.parse_const_arg()?) } else { None };
let span = if let Some(ref default) = default {
mistyped_const_ident.span.to(default.value.span)
} else {
mistyped_const_ident.span.to(ty.span)
};
self.dcx()
.struct_span_err(
@@ -156,7 +166,7 @@ impl<'a> Parser<'a> {
id: ast::DUMMY_NODE_ID,
attrs: preceding_attrs,
bounds: Vec::new(),
kind: GenericParamKind::Const { ty, kw_span: mistyped_const_ident.span, default },
kind: GenericParamKind::Const { ty, span, default },
is_placeholder: false,
colon_span: None,
})