trans::context: Remove some tcx::tls wackiness

michaelwoerister · michaelwoerister · commit b37d7a4bfb55 · 2016-05-06T17:09:18.000-04:00
diff --git a/src/librustc_trans/context.rs b/src/librustc_trans/context.rs
@@ -180,10 +180,7 @@ impl<'tcx> DepTrackingMapConfig for TraitSelectionCache<'tcx> {
     type Key = ty::PolyTraitRef<'tcx>;
     type Value = traits::Vtable<'tcx, ()>;
     fn to_dep_node(key: &ty::PolyTraitRef<'tcx>) -> DepNode<DefId> {
-        ty::tls::with(|tcx| {
-            let lifted_key = tcx.lift(key).unwrap();
-            lifted_key.to_poly_trait_predicate().dep_node()
-        })
+        key.to_poly_trait_predicate().dep_node()
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -180,10 +180,7 @@ impl<'tcx> DepTrackingMapConfig for TraitSelectionCache<'tcx> {`
`180`	`180`	`type Key = ty::PolyTraitRef<'tcx>;`
`181`	`181`	`type Value = traits::Vtable<'tcx, ()>;`
`182`	`182`	`fn to_dep_node(key: &ty::PolyTraitRef<'tcx>) -> DepNode<DefId> {`
`183`		`- ty::tls::with(\|tcx\| {`
`184`		`- let lifted_key = tcx.lift(key).unwrap();`
`185`		`- lifted_key.to_poly_trait_predicate().dep_node()`
`186`		`- })`
	`183`	`+ key.to_poly_trait_predicate().dep_node()`
`187`	`184`	`}`
`188`	`185`	`}`
`189`	`186`