mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-03 07:04:49 +00:00
Run cargo fix --edition-idioms
This commit is contained in:
parent
23d25a3094
commit
816f7fe12a
230 changed files with 888 additions and 888 deletions
|
@ -522,7 +522,7 @@ fn match_loop_inner<'t>(
|
|||
|
||||
fn match_loop(pattern: &MetaTemplate, src: &tt::Subtree) -> Match {
|
||||
let mut src = TtIter::new(src);
|
||||
let mut stack: SmallVec<[TtIter; 1]> = SmallVec::new();
|
||||
let mut stack: SmallVec<[TtIter<'_>; 1]> = SmallVec::new();
|
||||
let mut res = Match::default();
|
||||
let mut error_recover_item = None;
|
||||
|
||||
|
@ -656,7 +656,7 @@ fn match_loop(pattern: &MetaTemplate, src: &tt::Subtree) -> Match {
|
|||
}
|
||||
}
|
||||
|
||||
fn match_leaf(lhs: &tt::Leaf, src: &mut TtIter) -> Result<(), ExpandError> {
|
||||
fn match_leaf(lhs: &tt::Leaf, src: &mut TtIter<'_>) -> Result<(), ExpandError> {
|
||||
let rhs = src
|
||||
.expect_leaf()
|
||||
.map_err(|()| ExpandError::binding_error(format!("expected leaf: `{lhs}`")))?;
|
||||
|
@ -677,7 +677,7 @@ fn match_leaf(lhs: &tt::Leaf, src: &mut TtIter) -> Result<(), ExpandError> {
|
|||
}
|
||||
}
|
||||
|
||||
fn match_meta_var(kind: &str, input: &mut TtIter) -> ExpandResult<Option<Fragment>> {
|
||||
fn match_meta_var(kind: &str, input: &mut TtIter<'_>) -> ExpandResult<Option<Fragment>> {
|
||||
let fragment = match kind {
|
||||
"path" => parser::PrefixEntryPoint::Path,
|
||||
"ty" => parser::PrefixEntryPoint::Ty,
|
||||
|
|
|
@ -75,7 +75,7 @@ struct ExpandCtx<'a> {
|
|||
}
|
||||
|
||||
fn expand_subtree(
|
||||
ctx: &mut ExpandCtx,
|
||||
ctx: &mut ExpandCtx<'_>,
|
||||
template: &MetaTemplate,
|
||||
delimiter: Option<Delimiter>,
|
||||
arena: &mut Vec<tt::TokenTree>,
|
||||
|
@ -127,7 +127,7 @@ fn expand_subtree(
|
|||
ExpandResult { value: tt::Subtree { delimiter, token_trees: tts }, err }
|
||||
}
|
||||
|
||||
fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr, id: tt::TokenId) -> ExpandResult<Fragment> {
|
||||
fn expand_var(ctx: &mut ExpandCtx<'_>, v: &SmolStr, id: tt::TokenId) -> ExpandResult<Fragment> {
|
||||
// We already handle $crate case in mbe parser
|
||||
debug_assert!(v != "crate");
|
||||
|
||||
|
@ -163,7 +163,7 @@ fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr, id: tt::TokenId) -> ExpandResult
|
|||
}
|
||||
|
||||
fn expand_repeat(
|
||||
ctx: &mut ExpandCtx,
|
||||
ctx: &mut ExpandCtx<'_>,
|
||||
template: &MetaTemplate,
|
||||
kind: RepeatKind,
|
||||
separator: &Option<Separator>,
|
||||
|
|
|
@ -268,7 +268,7 @@ impl DeclarativeMacro {
|
|||
}
|
||||
|
||||
impl Rule {
|
||||
fn parse(src: &mut TtIter, expect_arrow: bool) -> Result<Self, ParseError> {
|
||||
fn parse(src: &mut TtIter<'_>, expect_arrow: bool) -> Result<Self, ParseError> {
|
||||
let lhs = src.expect_subtree().map_err(|()| ParseError::expected("expected subtree"))?;
|
||||
if expect_arrow {
|
||||
src.expect_char('=').map_err(|()| ParseError::expected("expected `=`"))?;
|
||||
|
|
|
@ -194,7 +194,7 @@ fn is_boolean_literal(lit: &tt::Literal) -> bool {
|
|||
matches!(lit.text.as_str(), "true" | "false")
|
||||
}
|
||||
|
||||
fn parse_repeat(src: &mut TtIter) -> Result<(Option<Separator>, RepeatKind), ParseError> {
|
||||
fn parse_repeat(src: &mut TtIter<'_>) -> Result<(Option<Separator>, RepeatKind), ParseError> {
|
||||
let mut separator = Separator::Puncts(SmallVec::new());
|
||||
for tt in src {
|
||||
let tt = match tt {
|
||||
|
@ -231,7 +231,7 @@ fn parse_repeat(src: &mut TtIter) -> Result<(Option<Separator>, RepeatKind), Par
|
|||
Err(ParseError::InvalidRepeat)
|
||||
}
|
||||
|
||||
fn parse_metavar_expr(src: &mut TtIter) -> Result<Op, ()> {
|
||||
fn parse_metavar_expr(src: &mut TtIter<'_>) -> Result<Op, ()> {
|
||||
let func = src.expect_ident()?;
|
||||
let args = src.expect_subtree()?;
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
use syntax::{SyntaxKind, SyntaxKind::*, T};
|
||||
use tt::buffer::TokenBuffer;
|
||||
|
||||
pub(crate) fn to_parser_input(buffer: &TokenBuffer) -> parser::Input {
|
||||
pub(crate) fn to_parser_input(buffer: &TokenBuffer<'_>) -> parser::Input {
|
||||
let mut res = parser::Input::default();
|
||||
|
||||
let mut current = buffer.begin();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue