Skip to content

Commit 2bb2536

Browse files
committed
Merge pull request #4281 from Dretch/io-explicit-self
Convert core::io to use explicit self (for issue #4118 and issue #2004)
2 parents cd6960e + feff3a9 commit 2bb2536

File tree

4 files changed

+184
-190
lines changed

4 files changed

+184
-190
lines changed

Diff for: src/libcore/hash.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ fn SipState(key0: u64, key1: u64) -> SipState {
188188
}
189189

190190

191-
impl &SipState : io::Writer {
191+
impl SipState : io::Writer {
192192

193193
// Methods for io::writer
194194
#[inline(always)]
195-
fn write(msg: &[const u8]) {
195+
fn write(&self, msg: &[const u8]) {
196196

197197
macro_rules! u8to64_le (
198198
($buf:expr, $i:expr) =>
@@ -282,16 +282,16 @@ impl &SipState : io::Writer {
282282
self.ntail = left;
283283
}
284284

285-
fn seek(_x: int, _s: io::SeekStyle) {
285+
fn seek(&self, _x: int, _s: io::SeekStyle) {
286286
fail;
287287
}
288-
fn tell() -> uint {
288+
fn tell(&self) -> uint {
289289
self.length
290290
}
291-
fn flush() -> int {
291+
fn flush(&self) -> int {
292292
0
293293
}
294-
fn get_type() -> io::WriterType {
294+
fn get_type(&self) -> io::WriterType {
295295
io::File
296296
}
297297
}

0 commit comments

Comments
 (0)