Fix tidy errors

bjorn3 · bjorn3 · commit 598350c99d34 · 2018-03-29T13:44:23.000+02:00
diff --git a/src/librustc/infer/freshen.rs b/src/librustc/infer/freshen.rs
@@ -200,7 +200,9 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {
             ty::TyAnon(..) => {
                 t.super_fold_with(self)
             }
-            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in TypeFreshener"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
+                bug!("Unexpected {:?} in TypeFreshener", t);
+            }
         }
     }
 }
diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
@@ -264,7 +264,9 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
                 ty::TyForeign(..) => Some(19),
                 ty::TyGeneratorWitness(..) => Some(20),
                 ty::TyInfer(..) | ty::TyError => None,
-                ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("unexpected TyUnusedParam in fuzzy_match_tys"),
+                ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
+                    bug!("unexpected {:?} in fuzzy_match_tys", t);
+                }
             }
         }
 
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
@@ -2037,7 +2037,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
                 ))
             }
 
-            ty::TyProjection(_) | ty::TyParam(_) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyAnon(..) => None,
+            ty::TyProjection(_) | ty::TyParam(_) | ty::TyUnusedParam |
+            ty::TyLayoutOnlyParam(_, _) | ty::TyAnon(..) => None,
             ty::TyInfer(ty::TyVar(_)) => Ambiguous,
 
             ty::TyInfer(ty::CanonicalTy(_)) |
@@ -2114,7 +2115,9 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
                 bug!("asked to assemble builtin bounds of unexpected type: {:?}",
                      self_ty);
             }
-            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in copy_clone_conditions"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
+                bug!("Unexpected {:?} in copy_clone_conditions", self_ty);
+            }
         }
     }
 
diff --git a/src/librustc/ty/flags.rs b/src/librustc/ty/flags.rs
@@ -190,7 +190,9 @@ impl FlagComputation {
             &ty::TyFnPtr(f) => {
                 self.add_fn_sig(f);
             }
-            &ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in FlagComputation::for_sty"),
+            &ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
+                bug!("Unexpected {:?} in FlagComputation::for_sty", st);
+            }
         }
     }
 
diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs
@@ -1712,7 +1712,8 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {
             ty::TyParam(_) => {
                 return Err(LayoutError::Unknown(ty));
             }
-            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyGeneratorWitness(..) | ty::TyInfer(_) | ty::TyError => {
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyGeneratorWitness(..) |
+            ty::TyInfer(_) | ty::TyError => {
                 bug!("LayoutDetails::compute: unexpected type `{}`", ty)
             }
         })
@@ -2287,8 +2288,8 @@ impl<'a, 'tcx> TyLayout<'tcx> {
                 }
             }
 
-            ty::TyProjection(_) | ty::TyAnon(..) | ty::TyParam(_) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
-            ty::TyInfer(_) | ty::TyError => {
+            ty::TyProjection(_) | ty::TyAnon(..) | ty::TyParam(_) | ty::TyUnusedParam |
+            ty::TyLayoutOnlyParam(_, _) | ty::TyInfer(_) | ty::TyError => {
                 bug!("TyLayout::field_type: unexpected type `{}`", self.ty)
             }
         })
diff --git a/src/librustc/ty/outlives.rs b/src/librustc/ty/outlives.rs
@@ -167,7 +167,9 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
                     self.compute_components(subty, out);
                 }
             }
-            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in compute_components"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
+                bug!("Unexpected TyUnusedParam in compute_components");
+            }
         }
     }
 
diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs
@@ -865,7 +865,8 @@ impl<'tcx> TypeFoldable<'tcx> for Ty<'tcx> {
             ty::TyAnon(did, substs) => ty::TyAnon(did, substs.fold_with(folder)),
             ty::TyBool | ty::TyChar | ty::TyStr | ty::TyInt(_) |
             ty::TyUint(_) | ty::TyFloat(_) | ty::TyError | ty::TyInfer(_) |
-            ty::TyParam(..) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyNever | ty::TyForeign(..) => return self
+            ty::TyParam(..) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
+            ty::TyNever | ty::TyForeign(..) => return self
         };
 
         if self.sty == sty {
@@ -900,7 +901,8 @@ impl<'tcx> TypeFoldable<'tcx> for Ty<'tcx> {
             ty::TyAnon(_, ref substs) => substs.visit_with(visitor),
             ty::TyBool | ty::TyChar | ty::TyStr | ty::TyInt(_) |
             ty::TyUint(_) | ty::TyFloat(_) | ty::TyError | ty::TyInfer(_) |
-            ty::TyParam(..) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyNever | ty::TyForeign(..) => false,
+            ty::TyParam(..) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) |
+            ty::TyNever | ty::TyForeign(..) => false,
         }
     }
 
diff --git a/src/librustc/ty/util.rs b/src/librustc/ty/util.rs
@@ -1126,7 +1126,9 @@ fn needs_drop_raw<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
                 |variant| variant.fields.iter().any(
                     |field| needs_drop(field.ty(tcx, substs)))),
 
-        ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in needs_drop_raw"),
+        ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
+            bug!("Unexpected type {:?} in needs_drop_raw", ty);
+        }
     }
 }
 
diff --git a/src/librustc/ty/walk.rs b/src/librustc/ty/walk.rs
@@ -82,8 +82,8 @@ pub fn walk_shallow<'tcx>(ty: Ty<'tcx>) -> AccIntoIter<TypeWalkerArray<'tcx>> {
 fn push_subtypes<'tcx>(stack: &mut TypeWalkerStack<'tcx>, parent_ty: Ty<'tcx>) {
     match parent_ty.sty {
         ty::TyBool | ty::TyChar | ty::TyInt(_) | ty::TyUint(_) | ty::TyFloat(_) |
-        ty::TyStr | ty::TyInfer(_) | ty::TyParam(_) | ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) | ty::TyNever |
-        ty::TyError | ty::TyForeign(..) => {
+        ty::TyStr | ty::TyInfer(_) | ty::TyParam(_) | ty::TyUnusedParam |
+        ty::TyLayoutOnlyParam(_, _) | ty::TyNever | ty::TyError | ty::TyForeign(..) => {
         }
         ty::TyArray(ty, len) => {
             push_const(stack, len);
diff --git a/src/librustc_typeck/check/cast.rs b/src/librustc_typeck/check/cast.rs
@@ -137,7 +137,9 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                     span, &format!("`{:?}` should be sized but is not?", t));
                 return Err(ErrorReported);
             }
-            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in FnCtxt::pointer_kind"),
+            ty::TyUnusedParam | ty::TyLayoutOnlyParam(_, _) => {
+                bug!("Unexpected {:?} in FnCtxt::pointer_kind", t);
+            }
         })
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,9 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {`
`200`	`200`	`ty::TyAnon(..) => {`
`201`	`201`	`t.super_fold_with(self)`
`202`	`202`	`}`
`203`		`- ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in TypeFreshener"),`
	`203`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
	`204`	`+ bug!("Unexpected {:?} in TypeFreshener", t);`
	`205`	`+ }`
`204`	`206`	`}`
`205`	`207`	`}`
`206`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,9 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {`
`264`	`264`	`ty::TyForeign(..) => Some(19),`
`265`	`265`	`ty::TyGeneratorWitness(..) => Some(20),`
`266`	`266`	`ty::TyInfer(..) \| ty::TyError => None,`
`267`		`- ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("unexpected TyUnusedParam in fuzzy_match_tys"),`
	`267`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
	`268`	`+ bug!("unexpected {:?} in fuzzy_match_tys", t);`
	`269`	`+ }`
`268`	`270`	`}`
`269`	`271`	`}`
`270`	`272`
Original file line number	Diff line number	Diff line change
`@@ -2037,7 +2037,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {`
`2037`	`2037`	`))`
`2038`	`2038`	`}`
`2039`	`2039`
`2040`		`- ty::TyProjection(_) \| ty::TyParam(_) \| ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) \| ty::TyAnon(..) => None,`
	`2040`	`+ ty::TyProjection(_) \| ty::TyParam(_) \| ty::TyUnusedParam \|`
	`2041`	`+ ty::TyLayoutOnlyParam(_, _) \| ty::TyAnon(..) => None,`
`2041`	`2042`	`ty::TyInfer(ty::TyVar(_)) => Ambiguous,`
`2042`	`2043`
`2043`	`2044`	`ty::TyInfer(ty::CanonicalTy(_)) \|`
`@@ -2114,7 +2115,9 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {`
`2114`	`2115`	`bug!("asked to assemble builtin bounds of unexpected type: {:?}",`
`2115`	`2116`	`self_ty);`
`2116`	`2117`	`}`
`2117`		`- ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in copy_clone_conditions"),`
	`2118`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
	`2119`	`+ bug!("Unexpected {:?} in copy_clone_conditions", self_ty);`
	`2120`	`+ }`
`2118`	`2121`	`}`
`2119`	`2122`	`}`
`2120`	`2123`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,9 @@ impl FlagComputation {`
`190`	`190`	`&ty::TyFnPtr(f) => {`
`191`	`191`	`self.add_fn_sig(f);`
`192`	`192`	`}`
`193`		`- &ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in FlagComputation::for_sty"),`
	`193`	`+ &ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
	`194`	`+ bug!("Unexpected {:?} in FlagComputation::for_sty", st);`
	`195`	`+ }`
`194`	`196`	`}`
`195`	`197`	`}`
`196`	`198`
Original file line number	Diff line number	Diff line change
`@@ -1712,7 +1712,8 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {`
`1712`	`1712`	`ty::TyParam(_) => {`
`1713`	`1713`	`return Err(LayoutError::Unknown(ty));`
`1714`	`1714`	`}`
`1715`		`- ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) \| ty::TyGeneratorWitness(..) \| ty::TyInfer(_) \| ty::TyError => {`
	`1715`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) \| ty::TyGeneratorWitness(..) \|`
	`1716`	`+ ty::TyInfer(_) \| ty::TyError => {`
`1716`	`1717`	bug!("LayoutDetails::compute: unexpected type `{}`", ty)
`1717`	`1718`	`}`
`1718`	`1719`	`})`
`@@ -2287,8 +2288,8 @@ impl<'a, 'tcx> TyLayout<'tcx> {`
`2287`	`2288`	`}`
`2288`	`2289`	`}`
`2289`	`2290`
`2290`		`- ty::TyProjection(_) \| ty::TyAnon(..) \| ty::TyParam(_) \| ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) \|`
`2291`		`- ty::TyInfer(_) \| ty::TyError => {`
	`2291`	`+ ty::TyProjection(_) \| ty::TyAnon(..) \| ty::TyParam(_) \| ty::TyUnusedParam \|`
	`2292`	`+ ty::TyLayoutOnlyParam(_, _) \| ty::TyInfer(_) \| ty::TyError => {`
`2292`	`2293`	bug!("TyLayout::field_type: unexpected type `{}`", self.ty)
`2293`	`2294`	`}`
`2294`	`2295`	`})`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,9 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {`
`167`	`167`	`self.compute_components(subty, out);`
`168`	`168`	`}`
`169`	`169`	`}`
`170`		`- ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in compute_components"),`
	`170`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
	`171`	`+ bug!("Unexpected TyUnusedParam in compute_components");`
	`172`	`+ }`
`171`	`173`	`}`
`172`	`174`	`}`
`173`	`175`
Original file line number	Diff line number	Diff line change
`@@ -1126,7 +1126,9 @@ fn needs_drop_raw<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,`
`1126`	`1126`	`\|variant\| variant.fields.iter().any(`
`1127`	`1127`	`\|field\| needs_drop(field.ty(tcx, substs)))),`
`1128`	`1128`
`1129`		`- ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in needs_drop_raw"),`
	`1129`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
	`1130`	`+ bug!("Unexpected type {:?} in needs_drop_raw", ty);`
	`1131`	`+ }`
`1130`	`1132`	`}`
`1131`	`1133`	`}`
`1132`	`1134`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,9 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {`
`137`	`137`	span, &format!("`{:?}` should be sized but is not?", t));
`138`	`138`	`return Err(ErrorReported);`
`139`	`139`	`}`
`140`		`- ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => bug!("Unexpected TyUnusedParam in FnCtxt::pointer_kind"),`
	`140`	`+ ty::TyUnusedParam \| ty::TyLayoutOnlyParam(_, _) => {`
	`141`	`+ bug!("Unexpected {:?} in FnCtxt::pointer_kind", t);`
	`142`	`+ }`
`141`	`143`	`})`
`142`	`144`	`}`
`143`	`145`	`}`