nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-29 03:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary cloning in Parser::get_ident_from_generic_arg.

Browse Source
This commit is contained in:
Nicholas Nethercote 2022-08-16 12:14:52 +10:00
parent 3e04fed6fa
commit 9619a2e3a3
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,7 +527,7 @@ impl<'a> Parser<'a> {
Ok(ident_gen_args) => ident_gen_args, Ok(ident_gen_args) => ident_gen_args,
Err(()) => return Ok(Some(AngleBracketedArg::Arg(arg))), Err(()) => return Ok(Some(AngleBracketedArg::Arg(arg))),
}; };
if binder.is_some() { if binder {
// FIXME(compiler-errors): this could be improved by suggesting lifting // FIXME(compiler-errors): this could be improved by suggesting lifting
// this up to the trait, at least before this becomes real syntax. // this up to the trait, at least before this becomes real syntax.
// e.g. `Trait<for<'a> Assoc = Ty>` -> `for<'a> Trait<Assoc = Ty>` // e.g. `Trait<for<'a> Assoc = Ty>` -> `for<'a> Trait<Assoc = Ty>`
@ -720,28 +720,24 @@ impl<'a> Parser<'a> {
/// Given a arg inside of generics, we try to destructure it as if it were the LHS in /// Given a arg inside of generics, we try to destructure it as if it were the LHS in
/// `LHS = ...`, i.e. an associated type binding. /// `LHS = ...`, i.e. an associated type binding.
/// This returns (optionally, if they are present) any `for<'a, 'b>` binder args, the /// This returns a bool indicating if there are any `for<'a, 'b>` binder args, the
/// identifier, and any GAT arguments. /// identifier, and any GAT arguments.
fn get_ident_from_generic_arg( fn get_ident_from_generic_arg(
&self, &self,
gen_arg: &GenericArg, gen_arg: &GenericArg,
) -> Result<(Option<Vec<ast::GenericParam>>, Ident, Option<GenericArgs>), ()> { ) -> Result<(bool, Ident, Option<GenericArgs>), ()> {
if let GenericArg::Type(ty) = gen_arg { if let GenericArg::Type(ty) = gen_arg {
if let ast::TyKind::Path(qself, path) = &ty.kind if let ast::TyKind::Path(qself, path) = &ty.kind
&& qself.is_none() && qself.is_none()
&& let [seg] = path.segments.as_slice() && let [seg] = path.segments.as_slice()
{ {
return Ok((None, seg.ident, seg.args.as_deref().cloned())); return Ok((false, seg.ident, seg.args.as_deref().cloned()));
} else if let ast::TyKind::TraitObject(bounds, ast::TraitObjectSyntax::None) = &ty.kind } else if let ast::TyKind::TraitObject(bounds, ast::TraitObjectSyntax::None) = &ty.kind
&& let [ast::GenericBound::Trait(trait_ref, ast::TraitBoundModifier::None)] = && let [ast::GenericBound::Trait(trait_ref, ast::TraitBoundModifier::None)] =
bounds.as_slice() bounds.as_slice()
&& let [seg] = trait_ref.trait_ref.path.segments.as_slice() && let [seg] = trait_ref.trait_ref.path.segments.as_slice()
{ {
return Ok(( return Ok((true, seg.ident, seg.args.as_deref().cloned()));
Some(trait_ref.bound_generic_params.clone()),
seg.ident,
seg.args.as_deref().cloned(),
));
} }
} }
Err(()) Err(())