diff options
| author | bors <bors@rust-lang.org> | 2014-02-12 04:36:43 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-12 04:36:43 -0800 |
| commit | fb12aebbd82eb3a7673738f1ed25f428b3d67242 (patch) | |
| tree | 58c06ef84316b7fd12df6b3786165018dd583f47 /src/libstd | |
| parent | e192cd97e77c38d20c29f7b10845d97e356b4d8a (diff) | |
| parent | 54760b9f27d2d4ce64f548d27c35cdab73e625ab (diff) | |
| download | rust-fb12aebbd82eb3a7673738f1ed25f428b3d67242.tar.gz rust-fb12aebbd82eb3a7673738f1ed25f428b3d67242.zip | |
auto merge of #12180 : eddyb/rust/rm-ty_type, r=nikomatsakis
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/reflect.rs | 2 | ||||
| -rw-r--r-- | src/libstd/repr.rs | 3 | ||||
| -rw-r--r-- | src/libstd/unstable/intrinsics.rs | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs index e441ea6ec74..1c22408592a 100644 --- a/src/libstd/reflect.rs +++ b/src/libstd/reflect.rs @@ -442,6 +442,8 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> { true } + // NOTE Remove after next snapshot. + #[cfg(stage0)] fn visit_type(&mut self) -> bool { if ! self.inner.visit_type() { return false; } true diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index c0f4efba0d1..4ced74a92b7 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -601,6 +601,9 @@ impl<'a> TyVisitor for ReprVisitor<'a> { fn visit_param(&mut self, _i: uint) -> bool { true } fn visit_self(&mut self) -> bool { true } + + // NOTE Remove after next snapshot. + #[cfg(stage0)] fn visit_type(&mut self) -> bool { true } } diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index 105236b5f4c..b9e9c9d5a43 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -160,6 +160,9 @@ pub trait TyVisitor { fn visit_trait(&mut self, name: &str) -> bool; fn visit_param(&mut self, i: uint) -> bool; fn visit_self(&mut self) -> bool; + + // NOTE Remove after next snapshot. + #[cfg(stage0)] fn visit_type(&mut self) -> bool; } |