diff options
| author | Graydon Hoare <graydon@pobox.com> | 2012-11-30 12:20:59 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@pobox.com> | 2012-11-30 12:20:59 -0800 |
| commit | f89d4ac8306dbe597f0bfef7cf92bea372eece1d (patch) | |
| tree | 2f40e7042228c2ce0874f972c92d82a89cf15985 /src/libstd | |
| parent | 946427b562d7ece5fc85c5067051c4aec73d5aff (diff) | |
| parent | d783f4d7bb543f33aaf0fc8a04c6d5b2493e8268 (diff) | |
| download | rust-f89d4ac8306dbe597f0bfef7cf92bea372eece1d.tar.gz rust-f89d4ac8306dbe597f0bfef7cf92bea372eece1d.zip | |
Merge pull request #4081 from graydon/iterbytes-and-workcache
libs: Remove transitionary material on iter_bytes, add workcache to buil...
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net_url.rs | 9 | ||||
| -rw-r--r-- | src/libstd/std.rc | 2 | ||||
| -rw-r--r-- | src/libstd/workcache.rs | 13 |
3 files changed, 1 insertions, 23 deletions
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs index 500d37604bc..136df3a4193 100644 --- a/src/libstd/net_url.rs +++ b/src/libstd/net_url.rs @@ -737,15 +737,6 @@ impl Url : Eq { } } -#[cfg(stage0)] -impl Url: IterBytes { - pure fn iter_bytes(lsb0: bool, f: to_bytes::Cb) { - unsafe { self.to_str() }.iter_bytes(lsb0, f) - } -} - -#[cfg(stage1)] -#[cfg(stage2)] impl Url: IterBytes { pure fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) { unsafe { self.to_str() }.iter_bytes(lsb0, f) diff --git a/src/libstd/std.rc b/src/libstd/std.rc index a22bbe1cd6f..af2977634e9 100644 --- a/src/libstd/std.rc +++ b/src/libstd/std.rc @@ -85,7 +85,7 @@ pub mod par; pub mod cmp; pub mod base64; pub mod rl; -// pub mod workcache; +pub mod workcache; #[cfg(unicode)] mod unicode; diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs index 5bf90ef29c8..08f3d21be47 100644 --- a/src/libstd/workcache.rs +++ b/src/libstd/workcache.rs @@ -74,19 +74,6 @@ struct WorkKey { name: ~str } -#[cfg(stage0)] -impl WorkKey: to_bytes::IterBytes { - #[inline(always)] - pure fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) { - let mut flag = true; - self.kind.iter_bytes(lsb0, |bytes| {flag = f(bytes); flag}); - if !flag { return; } - self.name.iter_bytes(lsb0, f); - } -} - -#[cfg(stage1)] -#[cfg(stage2)] impl WorkKey: to_bytes::IterBytes { #[inline(always)] pure fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) { |