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

michaelwoerister · michaelwoerister · commit 00eabcbefab3 · 2016-05-09T16:17:00.000-04:00
diff --git a/src/librustc_trans/context.rs b/src/librustc_trans/context.rs
@@ -183,10 +183,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
`@@ -183,10 +183,7 @@ impl<'tcx> DepTrackingMapConfig for TraitSelectionCache<'tcx> {`
`183`	`183`	`type Key = ty::PolyTraitRef<'tcx>;`
`184`	`184`	`type Value = traits::Vtable<'tcx, ()>;`
`185`	`185`	`fn to_dep_node(key: &ty::PolyTraitRef<'tcx>) -> DepNode<DefId> {`
`186`		`- ty::tls::with(\|tcx\| {`
`187`		`- let lifted_key = tcx.lift(key).unwrap();`
`188`		`- lifted_key.to_poly_trait_predicate().dep_node()`
`189`		`- })`
	`186`	`+ key.to_poly_trait_predicate().dep_node()`
`190`	`187`	`}`
`191`	`188`	`}`
`192`	`189`