Skip to content

Commit e5286d9

Browse files
tmandrynikomatsakis
authored andcommitted
Convert implied_outlives_bounds to a query
1 parent ef97813 commit e5286d9

File tree

13 files changed

+381
-221
lines changed

13 files changed

+381
-221
lines changed

src/librustc/dep_graph/dep_node.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ define_dep_nodes!( <'tcx>
649649
[input] OutputFilenames,
650650
[] NormalizeProjectionTy(CanonicalProjectionGoal<'tcx>),
651651
[] NormalizeTyAfterErasingRegions(ParamEnvAnd<'tcx, Ty<'tcx>>),
652+
[] ImpliedOutlivesBounds(CanonicalTyGoal<'tcx>),
652653
[] DropckOutlives(CanonicalTyGoal<'tcx>),
653654
[] EvaluateObligation(CanonicalPredicateGoal<'tcx>),
654655
[] TypeOpEq(CanonicalTypeOpEqGoal<'tcx>),

src/librustc/infer/outlives/bounds.rs

Lines changed: 0 additions & 216 deletions
This file was deleted.

src/librustc/infer/outlives/env.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use infer::{GenericKind, InferCtxt};
1212
use infer::outlives::free_region_map::FreeRegionMap;
13-
use infer::outlives::bounds::{self, OutlivesBound};
13+
use traits::query::outlives_bounds::{self, OutlivesBound};
1414
use ty::{self, Ty};
1515

1616
use syntax::ast;
@@ -50,7 +50,7 @@ impl<'a, 'gcx: 'tcx, 'tcx: 'a> OutlivesEnvironment<'tcx> {
5050
region_bound_pairs: vec![],
5151
};
5252

53-
env.add_outlives_bounds(None, bounds::explicit_outlives_bounds(param_env));
53+
env.add_outlives_bounds(None, outlives_bounds::explicit_outlives_bounds(param_env));
5454

5555
env
5656
}

src/librustc/infer/outlives/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
1313
pub mod env;
1414
pub mod free_region_map;
15-
pub mod bounds;
1615
pub mod obligations;

src/librustc/traits/query/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pub mod dropck_outlives;
2323
pub mod evaluate_obligation;
2424
pub mod normalize;
2525
pub mod normalize_erasing_regions;
26+
pub mod outlives_bounds;
2627
pub mod type_op;
2728

2829
pub type CanonicalProjectionGoal<'tcx> =

0 commit comments

Comments
 (0)