bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

implement nits

Browse source
This commit is contained in:
Bastian Kauschke 2020-10-05 02:01:32 +02:00
parent 236689d6eb
commit 604bc876e0
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_ast_lowering/src/lib.rs
View file

@ -2210,7 +2210,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
.attrs
.iter()
.filter(|attr| self.sess.check_name(attr, sym::rustc_synthetic))
.map(|_| hir::SyntheticTyParamKind::Rustc)
.map(|_| hir::SyntheticTyParamKind::FromAttr)
.next(),
};

2
compiler/rustc_hir/src/hir.rs
View file

@ -509,7 +509,7 @@ impl Generics<'hir> {
pub enum SyntheticTyParamKind {
ImplTrait,
// Created by the `#[rustc_synthetic]` attribute.
Rustc,
FromAttr,
}
/// A where-clause in a definition.

3
compiler/rustc_passes/src/hir_id_validator.rs
View file

@ -170,7 +170,8 @@ impl<'a, 'hir> intravisit::Visitor<'hir> for HirIdValidator<'a, 'hir> {
..
} = param.kind
{
// Do nothing because bodging is fun.
// Synthetic impl trait parameters are owned by the node of the desugared type.
// This means it is correct for them to have a different owner.
} else {
intravisit::walk_generic_param(self, param);
}

8
compiler/rustc_typeck/src/astconv/generics.rs
View file

@ -548,10 +548,14 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
generics: &ty::Generics,
) -> bool {
let explicit = !seg.infer_args;
let impl_trait = generics.params.iter().any(|param| match param.kind {
let impl_trait =
generics.params.iter().any(|param| match param.kind {
ty::GenericParamDefKind::Type {
synthetic:
Some(hir::SyntheticTyParamKind::ImplTrait | hir::SyntheticTyParamKind::Rustc),
Some(
hir::SyntheticTyParamKind::ImplTrait
| hir::SyntheticTyParamKind::FromAttr,
),
..
} => true,
_ => false,