diff options
| author | bors <bors@rust-lang.org> | 2013-10-28 10:56:34 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-28 10:56:34 -0700 |
| commit | e6102fc2fa72501ebf10ad8853b2a31332e6bdfd (patch) | |
| tree | 4f553f9e135627ec1ef98dbc305888f0950d5e68 /src/libstd/rand | |
| parent | 0a9a706b20ee43c601c2c70d62059610d40198fe (diff) | |
| parent | 72557d83124aac4a362b99cbdb31a00f46be4bae (diff) | |
| download | rust-e6102fc2fa72501ebf10ad8853b2a31332e6bdfd.tar.gz rust-e6102fc2fa72501ebf10ad8853b2a31332e6bdfd.zip | |
auto merge of #10079 : alexcrichton/rust/no-reader-util, r=brson
These methods are all excellent candidates for default methods, so there's no need to require extra imports of various traits. Additionally, this was able to remove all the weird underscores after the method names. Yay!
Diffstat (limited to 'src/libstd/rand')
| -rw-r--r-- | src/libstd/rand/reader.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libstd/rand/reader.rs b/src/libstd/rand/reader.rs index f1e67da815e..b98dade4bf6 100644 --- a/src/libstd/rand/reader.rs +++ b/src/libstd/rand/reader.rs @@ -12,7 +12,6 @@ use option::{Some, None}; use rt::io::Reader; -use rt::io::ReaderByteConversions; use rand::Rng; @@ -51,17 +50,17 @@ impl<R: Reader> Rng for ReaderRng<R> { // platform just involves blitting the bytes into the memory // of the u32, similarly for BE on BE; avoiding byteswapping. if cfg!(target_endian="little") { - self.reader.read_le_u32_() + self.reader.read_le_u32() } else { - self.reader.read_be_u32_() + self.reader.read_be_u32() } } fn next_u64(&mut self) -> u64 { // see above for explanation. if cfg!(target_endian="little") { - self.reader.read_le_u64_() + self.reader.read_le_u64() } else { - self.reader.read_be_u64_() + self.reader.read_be_u64() } } fn fill_bytes(&mut self, v: &mut [u8]) { |
