rustc_codegen_llvm: move misplaced HasParamEnv impl.

eddyb · eddyb · commit 319dec89e7ce · 2021-09-18T01:42:45.000+03:00
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
@@ -835,6 +835,12 @@ impl ty::layout::HasTyCtxt<'tcx> for CodegenCx<'ll, 'tcx> {
     }
 }
 
+impl<'tcx, 'll> HasParamEnv<'tcx> for CodegenCx<'ll, 'tcx> {
+    fn param_env(&self) -> ty::ParamEnv<'tcx> {
+        ty::ParamEnv::reveal_all()
+    }
+}
+
 impl LayoutOfHelpers<'tcx> for CodegenCx<'ll, 'tcx> {
     type LayoutOfResult = TyAndLayout<'tcx>;
 
@@ -847,9 +853,3 @@ impl LayoutOfHelpers<'tcx> for CodegenCx<'ll, 'tcx> {
         }
     }
 }
-
-impl<'tcx, 'll> HasParamEnv<'tcx> for CodegenCx<'ll, 'tcx> {
-    fn param_env(&self) -> ty::ParamEnv<'tcx> {
-        ty::ParamEnv::reveal_all()
-    }
-}

Original file line number	Diff line number	Diff line change
`@@ -835,6 +835,12 @@ impl ty::layout::HasTyCtxt<'tcx> for CodegenCx<'ll, 'tcx> {`
`835`	`835`	`}`
`836`	`836`	`}`
`837`	`837`
	`838`	`+impl<'tcx, 'll> HasParamEnv<'tcx> for CodegenCx<'ll, 'tcx> {`
	`839`	`+ fn param_env(&self) -> ty::ParamEnv<'tcx> {`
	`840`	`+ ty::ParamEnv::reveal_all()`
	`841`	`+ }`
	`842`	`+}`
	`843`	`+`
`838`	`844`	`impl LayoutOfHelpers<'tcx> for CodegenCx<'ll, 'tcx> {`
`839`	`845`	`type LayoutOfResult = TyAndLayout<'tcx>;`
`840`	`846`
`@@ -847,9 +853,3 @@ impl LayoutOfHelpers<'tcx> for CodegenCx<'ll, 'tcx> {`
`847`	`853`	`}`
`848`	`854`	`}`
`849`	`855`	`}`
`850`		`-`
`851`		`-impl<'tcx, 'll> HasParamEnv<'tcx> for CodegenCx<'ll, 'tcx> {`
`852`		`- fn param_env(&self) -> ty::ParamEnv<'tcx> {`
`853`		`- ty::ParamEnv::reveal_all()`
`854`		`- }`
`855`		`-}`