@@ -408,14 +408,14 @@ impl<'tcx> Place<'tcx> {
408408self . as_ref ( ) . project_deeper ( more_projections, tcx)
409409}
410410
411- pub fn ty_from < D : ? Sized > (
411+ pub fn ty_from < D > (
412412local : Local ,
413413projection : & [ PlaceElem < ' tcx > ] ,
414414local_decls : & D ,
415415tcx : TyCtxt < ' tcx > ,
416416) -> PlaceTy < ' tcx >
417417where
418- D : HasLocalDecls < ' tcx > ,
418+ D : ? Sized + HasLocalDecls < ' tcx > ,
419419{
420420PlaceTy :: from_ty ( local_decls. local_decls ( ) [ local] . ty ) . multi_projection_ty ( tcx, projection)
421421}
@@ -529,9 +529,9 @@ impl<'tcx> PlaceRef<'tcx> {
529529Place { local : self . local , projection : tcx. mk_place_elems ( new_projections) }
530530}
531531
532- pub fn ty < D : ? Sized > ( & self , local_decls : & D , tcx : TyCtxt < ' tcx > ) -> PlaceTy < ' tcx >
532+ pub fn ty < D > ( & self , local_decls : & D , tcx : TyCtxt < ' tcx > ) -> PlaceTy < ' tcx >
533533where
534- D : HasLocalDecls < ' tcx > ,
534+ D : ? Sized + HasLocalDecls < ' tcx > ,
535535{
536536Place :: ty_from ( self . local , self . projection , local_decls, tcx)
537537}
@@ -630,19 +630,19 @@ impl<'tcx> Operand<'tcx> {
630630if let ty:: FnDef ( def_id, args) = * const_ty. kind ( ) { Some ( ( def_id, args) ) } else { None }
631631}
632632
633- pub fn ty < D : ? Sized > ( & self , local_decls : & D , tcx : TyCtxt < ' tcx > ) -> Ty < ' tcx >
633+ pub fn ty < D > ( & self , local_decls : & D , tcx : TyCtxt < ' tcx > ) -> Ty < ' tcx >
634634where
635- D : HasLocalDecls < ' tcx > ,
635+ D : ? Sized + HasLocalDecls < ' tcx > ,
636636{
637637match self {
638638& Operand :: Copy ( ref l) | & Operand :: Move ( ref l) => l. ty ( local_decls, tcx) . ty ,
639639Operand :: Constant ( c) => c. const_ . ty ( ) ,
640640}
641641}
642642
643- pub fn span < D : ? Sized > ( & self , local_decls : & D ) -> Span
643+ pub fn span < D > ( & self , local_decls : & D ) -> Span
644644where
645- D : HasLocalDecls < ' tcx > ,
645+ D : ? Sized + HasLocalDecls < ' tcx > ,
646646{
647647match self {
648648& Operand :: Copy ( ref l) | & Operand :: Move ( ref l) => {
@@ -674,7 +674,7 @@ impl<'tcx> ConstOperand<'tcx> {
674674}
675675
676676///////////////////////////////////////////////////////////////////////////
677- /// Rvalues
677+ // Rvalues
678678
679679pub enum RvalueInitializationState {
680680Shallow ,
@@ -721,9 +721,9 @@ impl<'tcx> Rvalue<'tcx> {
721721}
722722}
723723
724- pub fn ty < D : ? Sized > ( & self , local_decls : & D , tcx : TyCtxt < ' tcx > ) -> Ty < ' tcx >
724+ pub fn ty < D > ( & self , local_decls : & D , tcx : TyCtxt < ' tcx > ) -> Ty < ' tcx >
725725where
726- D : HasLocalDecls < ' tcx > ,
726+ D : ? Sized + HasLocalDecls < ' tcx > ,
727727{
728728match * self {
729729Rvalue :: Use ( ref operand) => operand. ty ( local_decls, tcx) ,
0 commit comments