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

Run cargo fmt

Browse source
This commit is contained in:
Amos Wenger 2022-07-20 15:06:15 +02:00
parent 8318035726
commit 7e285e1ef5
35 changed files with 190 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/parser/src/grammar/expressions.rs
View file

@ -19,7 +19,10 @@ pub(super) fn expr(p: &mut Parser<'_>) -> bool {
expr_bp(p, None, r, 1).is_some()
}
pub(super) fn expr_stmt(p: &mut Parser<'_>, m: Option<Marker>) -> Option<(CompletedMarker, BlockLike)> {
pub(super) fn expr_stmt(
p: &mut Parser<'_>,
m: Option<Marker>,
) -> Option<(CompletedMarker, BlockLike)> {
let r = Restrictions { forbid_structs: false, prefer_stmt: true };
expr_bp(p, m, r, 1)
}

5
crates/parser/src/grammar/expressions/atom.rs
View file

@ -60,7 +60,10 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet =
const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[T![let]]);
pub(super) fn atom_expr(p: &mut Parser<'_>, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> {
pub(super) fn atom_expr(
p: &mut Parser<'_>,
r: Restrictions,
) -> Option<(CompletedMarker, BlockLike)> {
if let Some(m) = literal(p) {
return Some((m, BlockLike::NotBlock));
}

11
crates/parser/src/grammar/paths.rs
View file

@ -27,7 +27,10 @@ pub(super) fn expr_path(p: &mut Parser<'_>) {
path(p, Mode::Expr);
}
pub(crate) fn type_path_for_qualifier(p: &mut Parser<'_>, qual: CompletedMarker) -> CompletedMarker {
pub(crate) fn type_path_for_qualifier(
p: &mut Parser<'_>,
qual: CompletedMarker,
) -> CompletedMarker {
path_for_qualifier(p, Mode::Type, qual)
}
@ -45,7 +48,11 @@ fn path(p: &mut Parser<'_>, mode: Mode) {
path_for_qualifier(p, mode, qual);
}
fn path_for_qualifier(p: &mut Parser<'_>, mode: Mode, mut qual: CompletedMarker) -> CompletedMarker {
fn path_for_qualifier(
p: &mut Parser<'_>,
mode: Mode,
mut qual: CompletedMarker,
) -> CompletedMarker {
loop {
let use_tree = matches!(p.nth(2), T![*] | T!['{']);
if p.at(T![::]) && !use_tree {