language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge commit '37f84c101b' into sync-from-ra

Browse source
This commit is contained in:
Laurențiu Nicola 2023-07-17 16:49:15 +03:00
parent 6502421771
commit 4704881b64
311 changed files with 13700 additions and 9110 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/parser/src/grammar/generic_args.rs
View file

@ -32,6 +32,9 @@ const GENERIC_ARG_FIRST: TokenSet = TokenSet::new(&[
])
.union(types::TYPE_FIRST);
// Despite its name, it can also be used for generic param list.
const GENERIC_ARG_RECOVERY_SET: TokenSet = TokenSet::new(&[T![>], T![,]]);
// test generic_arg
// type T = S<i32>;
fn generic_arg(p: &mut Parser<'_>) -> bool {
@ -55,6 +58,15 @@ fn generic_arg(p: &mut Parser<'_>) -> bool {
// test assoc_type_eq
// type T = StreamingIterator<Item<'a> = &'a T>;
types::type_(p);
} else if p.at_ts(GENERIC_ARG_RECOVERY_SET) {
// Although `const_arg()` recovers as expected, we want to
// handle those here to give the following message because
// we don't know whether this associated item is a type or
// const at this point.
// test_err recover_from_missing_assoc_item_binding
// fn f() -> impl Iterator<Item = , Item = > {}
p.error("missing associated item binding");
} else {
// test assoc_const_eq
// fn foo<F: Foo<N=3>>() {}
@ -141,12 +153,17 @@ pub(super) fn const_arg_expr(p: &mut Parser<'_>) {
expressions::literal(p);
lm.complete(p, PREFIX_EXPR);
}
_ => {
_ if paths::is_use_path_start(p) => {
// This shouldn't be hit by `const_arg`
let lm = p.start();
paths::use_path(p);
lm.complete(p, PATH_EXPR);
}
_ => {
// test_err recover_from_missing_const_default
// struct A<const N: i32 = , const M: i32 =>;
p.err_recover("expected a generic const argument", GENERIC_ARG_RECOVERY_SET);
}
}
}

3
crates/parser/src/grammar/generic_params.rs
View file

@ -79,10 +79,9 @@ fn const_param(p: &mut Parser<'_>, m: Marker) {
p.error("missing type for const parameter");
}
if p.at(T![=]) {
if p.eat(T![=]) {
// test const_param_default_literal
// struct A<const N: i32 = -1>;
p.bump(T![=]);
// test const_param_default_expression
// struct A<const N: i32 = { 1 }>;

2
crates/parser/src/shortcuts.rs
View file

@ -24,7 +24,7 @@ pub enum StrStep<'a> {
Error { msg: &'a str, pos: usize },
}
impl<'a> LexedStr<'a> {
impl LexedStr<'_> {
pub fn to_input(&self) -> crate::Input {
let mut res = crate::Input::default();
let mut was_joint = false;