general fixes

Author: fee1-dead

compiler/rustc_middle/src/ty/impls_ty.rs

@@ -99,7 +99,6 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for ty::subst::GenericArgKin
             }
             ty::subst::GenericArgKind::Constness(constness) => {
                 0xFFu8.hash_stable(hcx, hasher);
-                mem::discriminant(self).hash_stable(hcx, hasher);
                 constness.hash_stable(hcx, hasher);
             }
         }

compiler/rustc_middle/src/ty/mod.rs

@@ -329,7 +329,6 @@ impl fmt::Display for ConstnessArg {
 
 #[derive(Clone, Debug, PartialEq, Eq, Copy, Hash, TyEncodable, TyDecodable, HashStable)]
 #[derive(TypeFoldable, TypeVisitable)]
->>>>>>> Add new generic param
 pub struct ClosureSizeProfileData<'tcx> {
     /// Tuple containing the types of closure captures before the feature `capture_disjoint_fields`
     pub before_feature_tys: Ty<'tcx>,