remove type_op constructors

Author: lcnr

compiler/rustc_borrowck/src/type_check/canonical.rs

@@ -137,7 +137,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
 let _:Result<_,ErrorGuaranteed> = self.fully_perform_op(
  locations,
  category,
- param_env.and(type_op::prove_predicate::ProvePredicate::new(predicate)),
+ param_env.and(type_op::prove_predicate::ProvePredicate{predicate}),
 );
 }
 
@@ -162,7 +162,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
 let result:Result<_,ErrorGuaranteed> = self.fully_perform_op(
  location.to_locations(),
  category,
- param_env.and(type_op::normalize::Normalize::new(value)),
+ param_env.and(type_op::normalize::Normalize{value}),
 );
  result.unwrap_or(value)
 }
@@ -223,7 +223,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
 let _:Result<_,ErrorGuaranteed> = self.fully_perform_op(
 Locations::All(span),
 ConstraintCategory::Boring,
-self.param_env.and(type_op::ascribe_user_type::AscribeUserType::new(mir_ty, user_ty)),
+self.param_env.and(type_op::ascribe_user_type::AscribeUserType{mir_ty, user_ty}),
 );
 }
 

compiler/rustc_borrowck/src/type_check/free_region_relations.rs

@@ -280,7 +280,7 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
 }
 letTypeOpOutput{output: norm_ty,constraints: constraints_normalize, .. } = self
 .param_env
-.and(type_op::normalize::Normalize::new(ty))
+.and(type_op::normalize::Normalize{value: ty })
 .fully_perform(self.infcx, span)
 .unwrap_or_else(|guar| TypeOpOutput{
 output:Ty::new_error(self.infcx.tcx, guar),
@@ -318,7 +318,7 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
 for&(ty, _)in tcx.assumed_wf_types(tcx.local_parent(defining_ty_def_id)){
 let result:Result<_,ErrorGuaranteed> = self
 .param_env
-.and(type_op::normalize::Normalize::new(ty))
+.and(type_op::normalize::Normalize{value: ty })
 .fully_perform(self.infcx, span);
 letOk(TypeOpOutput{output: norm_ty,constraints: c, .. }) = result else{
 continue;

compiler/rustc_middle/src/traits/query.rs

@@ -15,25 +15,16 @@ use crate::infer::canonical::{Canonical, QueryResponse};
 usecrate::ty::{self,GenericArg,Ty,TyCtxt};
 
 pubmod type_op {
-use std::fmt;
-
 use rustc_macros::{HashStable,TypeFoldable,TypeVisitable};
 
-usecrate::ty::fold::TypeFoldable;
-usecrate::ty::{Predicate,Ty,TyCtxt,UserType};
+usecrate::ty::{Predicate,Ty,UserType};
 
 #[derive(Copy,Clone,Debug,Hash,PartialEq,Eq,HashStable,TypeFoldable,TypeVisitable)]
 pubstructAscribeUserType<'tcx>{
 pubmir_ty:Ty<'tcx>,
 pubuser_ty:UserType<'tcx>,
 }
 
-impl<'tcx>AscribeUserType<'tcx>{
-pubfnnew(mir_ty:Ty<'tcx>,user_ty:UserType<'tcx>) -> Self{
-Self{ mir_ty, user_ty }
-}
-}
-
 #[derive(Copy,Clone,Debug,Hash,PartialEq,Eq,HashStable,TypeFoldable,TypeVisitable)]
 pubstructEq<'tcx>{
 puba:Ty<'tcx>,
@@ -51,26 +42,11 @@ pub mod type_op {
 pubpredicate:Predicate<'tcx>,
 }
 
-impl<'tcx>ProvePredicate<'tcx>{
-pubfnnew(predicate:Predicate<'tcx>) -> Self{
-ProvePredicate{ predicate }
-}
-}
-
 #[derive(Copy,Clone,Debug,Hash,PartialEq,Eq,HashStable,TypeFoldable,TypeVisitable)]
 pubstructNormalize<T>{
 pubvalue:T,
 }
 
-impl<'tcx,T>Normalize<T>
-where
-T: fmt::Debug + TypeFoldable<TyCtxt<'tcx>>,
-{
-pubfnnew(value:T) -> Self{
-Self{ value }
-}
-}
-
 #[derive(Copy,Clone,Debug,Hash,PartialEq,Eq,HashStable,TypeFoldable,TypeVisitable)]
 pubstructImpliedOutlivesBounds<'tcx>{
 pubty:Ty<'tcx>,