hir: Preserve used syntax in TyKind::TraitObject

petrochenkov · petrochenkov · commit 38ed36bba466 · 2021-03-18T03:02:32.000+03:00
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -1964,7 +1964,7 @@ impl TyKind {
 }
 
 /// Syntax used to declare a trait object.
-#[derive(Clone, Copy, PartialEq, Encodable, Decodable, Debug)]
+#[derive(Clone, Copy, PartialEq, Encodable, Decodable, Debug, HashStable_Generic)]
 pub enum TraitObjectSyntax {
     Dyn,
     None,
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
@@ -1396,7 +1396,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 if kind != TraitObjectSyntax::Dyn {
                     self.maybe_lint_bare_trait(t.span, t.id, false);
                 }
-                hir::TyKind::TraitObject(bounds, lifetime_bound)
+                hir::TyKind::TraitObject(bounds, lifetime_bound, kind)
             }
             TyKind::ImplTrait(def_node_id, ref bounds) => {
                 let span = t.span;
@@ -2648,6 +2648,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                         hir::TyKind::TraitObject(
                             arena_vec![self; principal],
                             self.elided_dyn_bound(span),
+                            TraitObjectSyntax::None,
                         )
                     }
                     _ => hir::TyKind::Path(hir::QPath::Resolved(None, path)),
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs
@@ -6,7 +6,7 @@ use crate::{itemlikevisit, LangItem};
 
 use rustc_ast::util::parser::ExprPrecedence;
 use rustc_ast::{self as ast, CrateSugar, LlvmAsmDialect};
-use rustc_ast::{Attribute, FloatTy, IntTy, Label, LitKind, StrStyle, UintTy};
+use rustc_ast::{Attribute, FloatTy, IntTy, Label, LitKind, StrStyle, TraitObjectSyntax, UintTy};
 pub use rustc_ast::{BorrowKind, ImplPolarity, IsAuto};
 pub use rustc_ast::{CaptureBy, Movability, Mutability};
 use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};
@@ -2327,7 +2327,7 @@ pub enum TyKind<'hir> {
     OpaqueDef(ItemId, &'hir [GenericArg<'hir>]),
     /// A trait object type `Bound1 + Bound2 + Bound3`
     /// where `Bound` is a trait or a lifetime.
-    TraitObject(&'hir [PolyTraitRef<'hir>], Lifetime),
+    TraitObject(&'hir [PolyTraitRef<'hir>], Lifetime, TraitObjectSyntax),
     /// Unused for now.
     Typeof(AnonConst),
     /// `TyKind::Infer` means the type should be inferred instead of it having been
diff --git a/compiler/rustc_hir/src/intravisit.rs b/compiler/rustc_hir/src/intravisit.rs
@@ -709,7 +709,7 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) {
             visitor.visit_ty(ty);
             visitor.visit_anon_const(length)
         }
-        TyKind::TraitObject(bounds, ref lifetime) => {
+        TyKind::TraitObject(bounds, ref lifetime, _syntax) => {
             for bound in bounds {
                 visitor.visit_poly_trait_ref(bound, TraitBoundModifier::None);
             }
diff --git a/compiler/rustc_hir_pretty/src/lib.rs b/compiler/rustc_hir_pretty/src/lib.rs
@@ -410,7 +410,10 @@ impl<'a> State<'a> {
             }
             hir::TyKind::OpaqueDef(..) => self.s.word("/*impl Trait*/"),
             hir::TyKind::Path(ref qpath) => self.print_qpath(qpath, false),
-            hir::TyKind::TraitObject(bounds, ref lifetime) => {
+            hir::TyKind::TraitObject(bounds, ref lifetime, syntax) => {
+                if syntax == ast::TraitObjectSyntax::Dyn {
+                    self.word_space("dyn");
+                }
                 let mut first = true;
                 for bound in bounds {
                     if first {
diff --git a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/find_anon_type.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/find_anon_type.rs
@@ -99,7 +99,7 @@ impl Visitor<'tcx> for FindNestedTypeVisitor<'tcx> {
                 return;
             }
 
-            hir::TyKind::TraitObject(bounds, _) => {
+            hir::TyKind::TraitObject(bounds, ..) => {
                 for bound in bounds {
                     self.current_index.shift_in(1);
                     self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);
diff --git a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs
@@ -292,7 +292,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
                         );
                     }
                 }
-                TyKind::TraitObject(_, lt) => match lt.name {
+                TyKind::TraitObject(_, lt, _) => match lt.name {
                     LifetimeName::ImplicitObjectLifetimeDefault => {
                         err.span_suggestion_verbose(
                             fn_return.span.shrink_to_hi(),
@@ -498,6 +498,7 @@ impl<'tcx> Visitor<'tcx> for HirTraitObjectVisitor {
         if let TyKind::TraitObject(
             poly_trait_refs,
             Lifetime { name: LifetimeName::ImplicitObjectLifetimeDefault, .. },
+            _,
         ) = t.kind
         {
             for ptr in poly_trait_refs {
diff --git a/compiler/rustc_middle/src/ty/diagnostics.rs b/compiler/rustc_middle/src/ty/diagnostics.rs
@@ -314,6 +314,7 @@ impl<'v> hir::intravisit::Visitor<'v> for TraitObjectVisitor<'v> {
                         hir::LifetimeName::ImplicitObjectLifetimeDefault | hir::LifetimeName::Static,
                     ..
                 },
+                _,
             ) => {
                 self.0.push(ty);
             }
diff --git a/compiler/rustc_resolve/src/late/lifetimes.rs b/compiler/rustc_resolve/src/late/lifetimes.rs
@@ -540,7 +540,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                 self.missing_named_lifetime_spots.pop();
                 self.is_in_fn_syntax = was_in_fn_syntax;
             }
-            hir::TyKind::TraitObject(bounds, ref lifetime) => {
+            hir::TyKind::TraitObject(bounds, ref lifetime, _) => {
                 debug!("visit_ty: TraitObject(bounds={:?}, lifetime={:?})", bounds, lifetime);
                 for bound in bounds {
                     self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);
@@ -2299,7 +2299,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
                     self.outer_index.shift_in(1);
                 }
                 match ty.kind {
-                    hir::TyKind::TraitObject(bounds, ref lifetime) => {
+                    hir::TyKind::TraitObject(bounds, ref lifetime, _) => {
                         for bound in bounds {
                             self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);
                         }
diff --git a/compiler/rustc_typeck/src/astconv/mod.rs b/compiler/rustc_typeck/src/astconv/mod.rs
@@ -2201,7 +2201,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                     Some(ast_ty),
                 ))
             }
-            hir::TyKind::TraitObject(ref bounds, ref lifetime) => {
+            hir::TyKind::TraitObject(ref bounds, ref lifetime, _) => {
                 self.conv_object_ty_poly_trait_ref(ast_ty.span, bounds, lifetime, borrowed)
             }
             hir::TyKind::Path(hir::QPath::Resolved(ref maybe_qself, ref path)) => {
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
@@ -1477,7 +1477,7 @@ impl Clean<Type> for hir::Ty<'_> {
                 }
             }
             TyKind::Path(_) => clean_qpath(&self, cx),
-            TyKind::TraitObject(ref bounds, ref lifetime) => {
+            TyKind::TraitObject(ref bounds, ref lifetime, _) => {
                 match bounds[0].clean(cx).trait_ {
                     ResolvedPath { path, param_names: None, did, is_generic } => {
                         let mut bounds: Vec<self::GenericBound> = bounds[1..]
diff --git a/src/tools/clippy/clippy_lints/src/lifetimes.rs b/src/tools/clippy/clippy_lints/src/lifetimes.rs
@@ -387,7 +387,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
                 self.nested_elision_site_lts.append(&mut sub_visitor.all_lts());
                 return;
             },
-            TyKind::TraitObject(bounds, ref lt) => {
+            TyKind::TraitObject(bounds, ref lt, _) => {
                 if !lt.is_elided() {
                     self.unelided_trait_object_lifetime = true;
                 }
diff --git a/src/tools/clippy/clippy_lints/src/types/borrowed_box.rs b/src/tools/clippy/clippy_lints/src/types/borrowed_box.rs
@@ -50,7 +50,7 @@ pub(super) fn check(cx: &LateContext<'_>, hir_ty: &hir::Ty<'_>, lt: &Lifetime, m
                     // Originally reported as the issue #3128.
                     let inner_snippet = snippet(cx, inner.span, "..");
                     let suggestion = match &inner.kind {
-                        TyKind::TraitObject(bounds, lt_bound) if bounds.len() > 1 || !lt_bound.is_elided() => {
+                        TyKind::TraitObject(bounds, lt_bound, _) if bounds.len() > 1 || !lt_bound.is_elided() => {
                             format!("&{}({})", ltopt, &inner_snippet)
                         },
                         TyKind::Path(qpath)
@@ -86,7 +86,7 @@ pub(super) fn check(cx: &LateContext<'_>, hir_ty: &hir::Ty<'_>, lt: &Lifetime, m
 // Returns true if given type is `Any` trait.
 fn is_any_trait(t: &hir::Ty<'_>) -> bool {
     if_chain! {
-        if let TyKind::TraitObject(ref traits, _) = t.kind;
+        if let TyKind::TraitObject(ref traits, ..) = t.kind;
         if !traits.is_empty();
         // Only Send/Sync can be used as additional traits, so it is enough to
         // check only the first trait.
diff --git a/src/tools/clippy/clippy_lints/src/types/mod.rs b/src/tools/clippy/clippy_lints/src/types/mod.rs
@@ -911,7 +911,7 @@ impl<'tcx> Visitor<'tcx> for TypeComplexityVisitor {
             // function types bring a lot of overhead
             TyKind::BareFn(ref bare) if bare.abi == Abi::Rust => (50 * self.nest, 1),
 
-            TyKind::TraitObject(ref param_bounds, _) => {
+            TyKind::TraitObject(ref param_bounds, ..) => {
                 let has_lifetime_parameters = param_bounds.iter().any(|bound| {
                     bound
                         .bound_generic_params
diff --git a/src/tools/clippy/clippy_utils/src/hir_utils.rs b/src/tools/clippy/clippy_utils/src/hir_utils.rs
@@ -892,7 +892,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
             TyKind::OpaqueDef(_, arg_list) => {
                 self.hash_generic_args(arg_list);
             },
-            TyKind::TraitObject(_, lifetime) => {
+            TyKind::TraitObject(_, lifetime, _) => {
                 self.hash_lifetime(lifetime);
             },
             TyKind::Typeof(anon_const) => {

Original file line number	Diff line number	Diff line change
`@@ -1964,7 +1964,7 @@ impl TyKind {`
`1964`	`1964`	`}`
`1965`	`1965`
`1966`	`1966`	`/// Syntax used to declare a trait object.`
`1967`		`-#[derive(Clone, Copy, PartialEq, Encodable, Decodable, Debug)]`
	`1967`	`+#[derive(Clone, Copy, PartialEq, Encodable, Decodable, Debug, HashStable_Generic)]`
`1968`	`1968`	`pub enum TraitObjectSyntax {`
`1969`	`1969`	`Dyn,`
`1970`	`1970`	`None,`
Original file line number	Diff line number	Diff line change
`@@ -1396,7 +1396,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {`
`1396`	`1396`	`if kind != TraitObjectSyntax::Dyn {`
`1397`	`1397`	`self.maybe_lint_bare_trait(t.span, t.id, false);`
`1398`	`1398`	`}`
`1399`		`- hir::TyKind::TraitObject(bounds, lifetime_bound)`
	`1399`	`+ hir::TyKind::TraitObject(bounds, lifetime_bound, kind)`
`1400`	`1400`	`}`
`1401`	`1401`	`TyKind::ImplTrait(def_node_id, ref bounds) => {`
`1402`	`1402`	`let span = t.span;`
`@@ -2648,6 +2648,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {`
`2648`	`2648`	`hir::TyKind::TraitObject(`
`2649`	`2649`	`arena_vec![self; principal],`
`2650`	`2650`	`self.elided_dyn_bound(span),`
	`2651`	`+ TraitObjectSyntax::None,`
`2651`	`2652`	`)`
`2652`	`2653`	`}`
`2653`	`2654`	`_ => hir::TyKind::Path(hir::QPath::Resolved(None, path)),`
Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty<'v>) {`
`709`	`709`	`visitor.visit_ty(ty);`
`710`	`710`	`visitor.visit_anon_const(length)`
`711`	`711`	`}`
`712`		`- TyKind::TraitObject(bounds, ref lifetime) => {`
	`712`	`+ TyKind::TraitObject(bounds, ref lifetime, _syntax) => {`
`713`	`713`	`for bound in bounds {`
`714`	`714`	`visitor.visit_poly_trait_ref(bound, TraitBoundModifier::None);`
`715`	`715`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ impl Visitor<'tcx> for FindNestedTypeVisitor<'tcx> {`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`	`101`
`102`		`- hir::TyKind::TraitObject(bounds, _) => {`
	`102`	`+ hir::TyKind::TraitObject(bounds, ..) => {`
`103`	`103`	`for bound in bounds {`
`104`	`104`	`self.current_index.shift_in(1);`
`105`	`105`	`self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);`
Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {`
`292`	`292`	`);`
`293`	`293`	`}`
`294`	`294`	`}`
`295`		`- TyKind::TraitObject(_, lt) => match lt.name {`
	`295`	`+ TyKind::TraitObject(_, lt, _) => match lt.name {`
`296`	`296`	`LifetimeName::ImplicitObjectLifetimeDefault => {`
`297`	`297`	`err.span_suggestion_verbose(`
`298`	`298`	`fn_return.span.shrink_to_hi(),`
`@@ -498,6 +498,7 @@ impl<'tcx> Visitor<'tcx> for HirTraitObjectVisitor {`
`498`	`498`	`if let TyKind::TraitObject(`
`499`	`499`	`poly_trait_refs,`
`500`	`500`	`Lifetime { name: LifetimeName::ImplicitObjectLifetimeDefault, .. },`
	`501`	`+ _,`
`501`	`502`	`) = t.kind`
`502`	`503`	`{`
`503`	`504`	`for ptr in poly_trait_refs {`
Original file line number	Diff line number	Diff line change
`@@ -314,6 +314,7 @@ impl<'v> hir::intravisit::Visitor<'v> for TraitObjectVisitor<'v> {`
`314`	`314`	`hir::LifetimeName::ImplicitObjectLifetimeDefault \| hir::LifetimeName::Static,`
`315`	`315`	`..`
`316`	`316`	`},`
	`317`	`+ _,`
`317`	`318`	`) => {`
`318`	`319`	`self.0.push(ty);`
`319`	`320`	`}`
Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {`
`540`	`540`	`self.missing_named_lifetime_spots.pop();`
`541`	`541`	`self.is_in_fn_syntax = was_in_fn_syntax;`
`542`	`542`	`}`
`543`		`- hir::TyKind::TraitObject(bounds, ref lifetime) => {`
	`543`	`+ hir::TyKind::TraitObject(bounds, ref lifetime, _) => {`
`544`	`544`	`debug!("visit_ty: TraitObject(bounds={:?}, lifetime={:?})", bounds, lifetime);`
`545`	`545`	`for bound in bounds {`
`546`	`546`	`self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);`
`@@ -2299,7 +2299,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {`
`2299`	`2299`	`self.outer_index.shift_in(1);`
`2300`	`2300`	`}`
`2301`	`2301`	`match ty.kind {`
`2302`		`- hir::TyKind::TraitObject(bounds, ref lifetime) => {`
	`2302`	`+ hir::TyKind::TraitObject(bounds, ref lifetime, _) => {`
`2303`	`2303`	`for bound in bounds {`
`2304`	`2304`	`self.visit_poly_trait_ref(bound, hir::TraitBoundModifier::None);`
`2305`	`2305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2201,7 +2201,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {`
`2201`	`2201`	`Some(ast_ty),`
`2202`	`2202`	`))`
`2203`	`2203`	`}`
`2204`		`- hir::TyKind::TraitObject(ref bounds, ref lifetime) => {`
	`2204`	`+ hir::TyKind::TraitObject(ref bounds, ref lifetime, _) => {`
`2205`	`2205`	`self.conv_object_ty_poly_trait_ref(ast_ty.span, bounds, lifetime, borrowed)`
`2206`	`2206`	`}`
`2207`	`2207`	`hir::TyKind::Path(hir::QPath::Resolved(ref maybe_qself, ref path)) => {`
Original file line number	Diff line number	Diff line change
`@@ -1477,7 +1477,7 @@ impl Clean<Type> for hir::Ty<'_> {`
`1477`	`1477`	`}`
`1478`	`1478`	`}`
`1479`	`1479`	`TyKind::Path(_) => clean_qpath(&self, cx),`
`1480`		`- TyKind::TraitObject(ref bounds, ref lifetime) => {`
	`1480`	`+ TyKind::TraitObject(ref bounds, ref lifetime, _) => {`
`1481`	`1481`	`match bounds[0].clean(cx).trait_ {`
`1482`	`1482`	`ResolvedPath { path, param_names: None, did, is_generic } => {`
`1483`	`1483`	`let mut bounds: Vec<self::GenericBound> = bounds[1..]`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {`
`387`	`387`	`self.nested_elision_site_lts.append(&mut sub_visitor.all_lts());`
`388`	`388`	`return;`
`389`	`389`	`},`
`390`		`- TyKind::TraitObject(bounds, ref lt) => {`
	`390`	`+ TyKind::TraitObject(bounds, ref lt, _) => {`
`391`	`391`	`if !lt.is_elided() {`
`392`	`392`	`self.unelided_trait_object_lifetime = true;`
`393`	`393`	`}`