dogfood

Author: y21

clippy_lints/src/manual_assoc_type_bounds.rs

@@ -54,7 +54,7 @@ struct TyParamState {
     ///     fn f<T: Iterator<Item = P>, P: Copy>() -> P {}
     ///                             ^   ^             ^
     ///
-    /// After having visited everything in the item, the use_count of the generic parameter `P`
+    /// After having visited everything in the item, the `use_count` of the generic parameter `P`
     /// is 3.
     /// We then check uses of `P` in the where clause and count 2 valid uses. `3 - 2 != 0` so at
     /// this point we see that we shouldn't lint.
@@ -186,7 +186,7 @@ impl ItemState {
     ///
     /// - `U: Trait` if exactly one `T: Trait<Assoc = U>` bound exists in `trait_bounds` (i.e.,
     ///   exactly one trait bound that has `U` as its associated type and is not used anywhere else,
-    ///   ensured by use_count == 0). Add `Emission::TyParamBound(U: Trait)` to `T: Trait<Assoc =
+    ///   ensured by `use_count` == 0). Add `Emission::TyParamBound(U: Trait)` to `T: Trait<Assoc =
     ///   U>`s [`TraitBound::emissions`].
     ///
     ///   Note that synthetic/anonymous generic parameters introduced by `impl Trait` (e.g. `T:
@@ -277,7 +277,7 @@ impl ItemState {
                 // TODO: REALLY dont use + iterate a hashmap here and isntead just sort?
                 let grouped_emissions = emissions
                     .iter()
-                    .into_group_map_by(|e| e.assoc_ty(trait_path_segment, &self));
+                    .into_group_map_by(|e| e.assoc_ty(trait_path_segment, self));
 
                 if let Some(args) = trait_path_segment.args
                     && let Some(args_span) = args.span()
@@ -350,7 +350,7 @@ impl ItemState {
                         new_bounds += assoc.as_str();
                         new_bounds += ": ";
 
-                        Emission::append_bounds(&emissions, cx, &mut new_bounds, false);
+                        Emission::append_bounds(emissions, cx, &mut new_bounds, false);
                     }
 
                     new_bounds += ">";
@@ -412,24 +412,12 @@ impl_lint_pass!(ManualAssocTypeBounds => [MANUAL_ASSOC_TYPE_BOUNDS]);
 #[derive(Debug)]
 enum Emission {
     ProjectionBound {
-        // /// fn f<T>() where T: Iterator, <T as Iterator>::Item: Copy + Sized, {}
-        // ///                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-        // predicate_span: Span,
         predicate_index: usize,
-        /// fn f<T>() where T: Iterator, <T as Iterator>::Item: Copy + Sized, {}
-        ///                                                     ^^^^^^^^^^^^
         bounds_span: Span,
-        /// fn f<T>() where T: Iterator, <T as Iterator>::Item: Copy + Sized, {}
-        ///                                               ^^^^
         assoc_type: Ident,
     },
     TyParamBound {
-        /// fn f<T, P>() where T: Iterator<Item = P>, P: Copy + Sized, {}
-        ///                                           ^^^^^^^^^^^^^^^
-        // predicate_span: Span,
         predicate_index: usize,
-        /// fn f<T, P>() where T: Iterator<Item = P>, P: Copy + Sized, {}
-        ///                                              ^^^^^^^^^^^^
         bounds_span: Span,
         /// Index into `ItemState::ty_params`
         ty_param_index: usize,

clippy_utils/src/ty.rs

@@ -251,7 +251,7 @@ pub fn implements_trait_with_env_from_iter<'tcx>(
     ty: Ty<'tcx>,
     trait_id: DefId,
     callee_id: Option<DefId>,
-    args: impl IntoIterator<Item = impl Into<Option<GenericArg<'tcx>>>>,
+    args: impl IntoIterator<Item: Into<Option<GenericArg<'tcx>>>>,
 ) -> bool {
     // Clippy shouldn't have infer types
     assert!(!ty.has_infer());
@@ -1073,7 +1073,7 @@ pub fn make_projection<'tcx>(
     tcx: TyCtxt<'tcx>,
     container_id: DefId,
     assoc_ty: Symbol,
-    args: impl IntoIterator<Item = impl Into<GenericArg<'tcx>>>,
+    args: impl IntoIterator<Item: Into<GenericArg<'tcx>>>,
 ) -> Option<AliasTy<'tcx>> {
     fn helper<'tcx>(
         tcx: TyCtxt<'tcx>,
@@ -1114,7 +1114,7 @@ pub fn make_normalized_projection<'tcx>(
     param_env: ParamEnv<'tcx>,
     container_id: DefId,
     assoc_ty: Symbol,
-    args: impl IntoIterator<Item = impl Into<GenericArg<'tcx>>>,
+    args: impl IntoIterator<Item: Into<GenericArg<'tcx>>>,
 ) -> Option<Ty<'tcx>> {
     fn helper<'tcx>(tcx: TyCtxt<'tcx>, param_env: ParamEnv<'tcx>, ty: AliasTy<'tcx>) -> Option<Ty<'tcx>> {
         #[cfg(debug_assertions)]
@@ -1241,7 +1241,7 @@ pub fn make_normalized_projection_with_regions<'tcx>(
     param_env: ParamEnv<'tcx>,
     container_id: DefId,
     assoc_ty: Symbol,
-    args: impl IntoIterator<Item = impl Into<GenericArg<'tcx>>>,
+    args: impl IntoIterator<Item: Into<GenericArg<'tcx>>>,
 ) -> Option<Ty<'tcx>> {
     fn helper<'tcx>(tcx: TyCtxt<'tcx>, param_env: ParamEnv<'tcx>, ty: AliasTy<'tcx>) -> Option<Ty<'tcx>> {
         #[cfg(debug_assertions)]