diff options
| author | bors <bors@rust-lang.org> | 2013-12-11 12:56:22 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-11 12:56:22 -0800 |
| commit | 1b12dca7f97a51c6cbb4f47ea6e095d841a97c1a (patch) | |
| tree | 19f1a66a4ced0e180c4fa1720ecfe53b14e92465 /src/libstd/rand | |
| parent | 47d10c745ebcc31768e98083c8c6d5396f4edcdb (diff) | |
| parent | 5731ca3078318a66a13208133d8839a9f9f92629 (diff) | |
| download | rust-1b12dca7f97a51c6cbb4f47ea6e095d841a97c1a.tar.gz rust-1b12dca7f97a51c6cbb4f47ea6e095d841a97c1a.zip | |
auto merge of #10897 : boredomist/rust/remove-self-lifetime, r=brson
Also remove all instances of 'self within the codebase. This fixes #10889. To make reviewing easier the following files were modified with more than a dumb text replacement: - `src/test/compile-fail/lifetime-no-keyword.rs` - `src/test/compile-fail/lifetime-obsoleted-self.rs` - `src/test/compile-fail/regions-free-region-ordering-incorrect.rs` - `src/libsyntax/parse/lexer.rs`
Diffstat (limited to 'src/libstd/rand')
| -rw-r--r-- | src/libstd/rand/isaac.rs | 12 | ||||
| -rw-r--r-- | src/libstd/rand/mod.rs | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/libstd/rand/isaac.rs b/src/libstd/rand/isaac.rs index 877df1fb644..3dcf97212f5 100644 --- a/src/libstd/rand/isaac.rs +++ b/src/libstd/rand/isaac.rs @@ -188,8 +188,8 @@ impl Rng for IsaacRng { } } -impl<'self> SeedableRng<&'self [u32]> for IsaacRng { - fn reseed(&mut self, seed: &'self [u32]) { +impl<'a> SeedableRng<&'a [u32]> for IsaacRng { + fn reseed(&mut self, seed: &'a [u32]) { // make the seed into [seed[0], seed[1], ..., seed[seed.len() // - 1], 0, 0, ...], to fill rng.rsl. let seed_iter = seed.iter().map(|&x| x).chain(Repeat::new(0u32)); @@ -210,7 +210,7 @@ impl<'self> SeedableRng<&'self [u32]> for IsaacRng { /// 256 and any more will be silently ignored. A generator /// constructed with a given seed will generate the same sequence /// of values as all other generators constructed with that seed. - fn from_seed(seed: &'self [u32]) -> IsaacRng { + fn from_seed(seed: &'a [u32]) -> IsaacRng { let mut rng = EMPTY; rng.reseed(seed); rng @@ -399,8 +399,8 @@ impl Rng for Isaac64Rng { } } -impl<'self> SeedableRng<&'self [u64]> for Isaac64Rng { - fn reseed(&mut self, seed: &'self [u64]) { +impl<'a> SeedableRng<&'a [u64]> for Isaac64Rng { + fn reseed(&mut self, seed: &'a [u64]) { // make the seed into [seed[0], seed[1], ..., seed[seed.len() // - 1], 0, 0, ...], to fill rng.rsl. let seed_iter = seed.iter().map(|&x| x).chain(Repeat::new(0u64)); @@ -421,7 +421,7 @@ impl<'self> SeedableRng<&'self [u64]> for Isaac64Rng { /// 256 and any more will be silently ignored. A generator /// constructed with a given seed will generate the same sequence /// of values as all other generators constructed with that seed. - fn from_seed(seed: &'self [u64]) -> Isaac64Rng { + fn from_seed(seed: &'a [u64]) -> Isaac64Rng { let mut rng = EMPTY_64; rng.reseed(seed); rng diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 3a33fb182aa..32c2402f39b 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -469,14 +469,14 @@ impl Rng for StdRng { } } -impl<'self> SeedableRng<&'self [uint]> for StdRng { - fn reseed(&mut self, seed: &'self [uint]) { +impl<'a> SeedableRng<&'a [uint]> for StdRng { + fn reseed(&mut self, seed: &'a [uint]) { // the internal RNG can just be seeded from the above // randomness. self.rng.reseed(unsafe {cast::transmute(seed)}) } - fn from_seed(seed: &'self [uint]) -> StdRng { + fn from_seed(seed: &'a [uint]) -> StdRng { StdRng { rng: SeedableRng::from_seed(unsafe {cast::transmute(seed)}) } } } |
