diff options
| author | varkor <github@varkor.com> | 2019-09-26 18:45:50 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2019-09-26 18:45:50 +0100 |
| commit | 79ff44873d7d12951a52b7f1d50560cd45d5ea2c (patch) | |
| tree | 7b97ee03c038f7c568668b39a08a684fb3bb242f /src | |
| parent | d5561936467fbb57d3eb432bcca9100338bab724 (diff) | |
Rename `PatternTypeProjection` to `PatTyProj`
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/build/matches/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/hair/cx/block.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/hair/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_mir/hair/pattern/mod.rs | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/librustc_mir/build/matches/mod.rs b/src/librustc_mir/build/matches/mod.rs index 29e778a06d1..05accd7f64e 100644 --- a/src/librustc_mir/build/matches/mod.rs +++ b/src/librustc_mir/build/matches/mod.rs @@ -708,7 +708,7 @@ struct Binding<'tcx> { struct Ascription<'tcx> { span: Span, source: Place<'tcx>, - user_ty: PatternTypeProjection<'tcx>, + user_ty: PatTyProj<'tcx>, variance: ty::Variance, } diff --git a/src/librustc_mir/hair/cx/block.rs b/src/librustc_mir/hair/cx/block.rs index 33b7bd59769..d9de0ffdf2f 100644 --- a/src/librustc_mir/hair/cx/block.rs +++ b/src/librustc_mir/hair/cx/block.rs @@ -83,7 +83,7 @@ fn mirror_stmts<'a, 'tcx>( span: pattern.span, kind: Box::new(PatKind::AscribeUserType { ascription: hair::pattern::Ascription { - user_ty: PatternTypeProjection::from_user_type(user_ty), + user_ty: PatTyProj::from_user_type(user_ty), user_ty_span: ty.span, variance: ty::Variance::Covariant, }, diff --git a/src/librustc_mir/hair/mod.rs b/src/librustc_mir/hair/mod.rs index 84879bdda99..66846b776cd 100644 --- a/src/librustc_mir/hair/mod.rs +++ b/src/librustc_mir/hair/mod.rs @@ -21,7 +21,7 @@ mod constant; pub mod pattern; pub use self::pattern::{BindingMode, Pattern, PatKind, PatRange, FieldPat}; -pub(crate) use self::pattern::PatternTypeProjection; +pub(crate) use self::pattern::PatTyProj; mod util; diff --git a/src/librustc_mir/hair/pattern/mod.rs b/src/librustc_mir/hair/pattern/mod.rs index 82a0085d4e8..5288fa36cc0 100644 --- a/src/librustc_mir/hair/pattern/mod.rs +++ b/src/librustc_mir/hair/pattern/mod.rs @@ -62,11 +62,11 @@ pub struct Pattern<'tcx> { #[derive(Copy, Clone, Debug, PartialEq)] -pub struct PatternTypeProjection<'tcx> { +pub struct PatTyProj<'tcx> { pub user_ty: CanonicalUserType<'tcx>, } -impl<'tcx> PatternTypeProjection<'tcx> { +impl<'tcx> PatTyProj<'tcx> { pub(crate) fn from_user_type(user_annotation: CanonicalUserType<'tcx>) -> Self { Self { user_ty: user_annotation, @@ -92,7 +92,7 @@ impl<'tcx> PatternTypeProjection<'tcx> { #[derive(Copy, Clone, Debug, PartialEq)] pub struct Ascription<'tcx> { - pub user_ty: PatternTypeProjection<'tcx>, + pub user_ty: PatTyProj<'tcx>, /// Variance to use when relating the type `user_ty` to the **type of the value being /// matched**. Typically, this is `Variance::Covariant`, since the value being matched must /// have a type that is some subtype of the ascribed type. @@ -831,7 +831,7 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> { kind: Box::new(kind), }, ascription: Ascription { - user_ty: PatternTypeProjection::from_user_type(user_ty), + user_ty: PatTyProj::from_user_type(user_ty), user_ty_span: span, variance: ty::Variance::Covariant, }, @@ -878,7 +878,7 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> { let user_provided_types = self.tables().user_provided_types(); return if let Some(u_ty) = user_provided_types.get(id) { - let user_ty = PatternTypeProjection::from_user_type(*u_ty); + let user_ty = PatTyProj::from_user_type(*u_ty); Pattern { span, kind: Box::new( @@ -1358,7 +1358,7 @@ CloneImpls!{ <'tcx> Span, Field, Mutability, ast::Name, hir::HirId, usize, ty::Const<'tcx>, Region<'tcx>, Ty<'tcx>, BindingMode, &'tcx AdtDef, SubstsRef<'tcx>, &'tcx GenericArg<'tcx>, UserType<'tcx>, - UserTypeProjection, PatternTypeProjection<'tcx> + UserTypeProjection, PatTyProj<'tcx> } impl<'tcx> PatternFoldable<'tcx> for FieldPat<'tcx> { |
