Skip to content

Commit 0425e6e

Browse files
committed
---
yaml --- r: 163549 b: refs/heads/snap-stage3 c: 375b79a h: refs/heads/master i: 163547: 6980e4b v: v3
1 parent d9c5724 commit 0425e6e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: d6d0bb2030f870c0b4b942da793beb4edb82c191
4+
refs/heads/snap-stage3: 375b79a0fb0a4f9dfc1edfed1154cda97c1f2bc3
55
refs/heads/try: 20cbbffeefc1f35e2ea63afce7b42fbd79611d42
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc/middle/infer/region_inference/graphviz.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use graphviz as dot;
2020

2121
use middle::ty;
2222
use super::Constraint;
23-
use middle::typeck::infer::SubregionOrigin;
24-
use middle::typeck::infer::region_inference::RegionVarBindings;
23+
use middle::infer::SubregionOrigin;
24+
use middle::infer::region_inference::RegionVarBindings;
2525
use session::config;
2626
use util::nodemap::{FnvHashMap, FnvHashSet};
2727
use util::ppaux::Repr;

branches/snap-stage3/src/librustc/middle/infer/region_inference/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mod doc;
4040
mod graphviz;
4141

4242
// A constraint that influences the inference process.
43-
#[deriving(PartialEq, Eq, Hash, Show)]
43+
#[deriving(Clone, PartialEq, Eq, Hash, Show)]
4444
pub enum Constraint {
4545
// One region variable is subregion of another
4646
ConstrainVarSubVar(RegionVid, RegionVid),

0 commit comments

Comments
 (0)