diff options
Diffstat (limited to 'src/libstd/old_io')
| -rw-r--r-- | src/libstd/old_io/buffered.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/comm_adapters.rs | 4 | ||||
| -rw-r--r-- | src/libstd/old_io/extensions.rs | 10 | ||||
| -rw-r--r-- | src/libstd/old_io/fs.rs | 20 | ||||
| -rw-r--r-- | src/libstd/old_io/mem.rs | 24 | ||||
| -rw-r--r-- | src/libstd/old_io/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/old_io/process.rs | 32 | ||||
| -rw-r--r-- | src/libstd/old_io/result.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_io/util.rs | 8 |
9 files changed, 53 insertions, 53 deletions
diff --git a/src/libstd/old_io/buffered.rs b/src/libstd/old_io/buffered.rs index 586cc1477f8..59a437ad916 100644 --- a/src/libstd/old_io/buffered.rs +++ b/src/libstd/old_io/buffered.rs @@ -97,7 +97,7 @@ impl<R: Reader> BufferedReader<R> { impl<R: Reader> Buffer for BufferedReader<R> { fn fill_buf<'a>(&'a mut self) -> IoResult<&'a [u8]> { if self.pos == self.cap { - self.cap = try!(self.inner.read(self.buf.as_mut_slice())); + self.cap = try!(self.inner.read(&mut self.buf)); self.pos = 0; } Ok(&self.buf[self.pos..self.cap]) diff --git a/src/libstd/old_io/comm_adapters.rs b/src/libstd/old_io/comm_adapters.rs index feb2ef6f4f3..d8f9b1bb3fe 100644 --- a/src/libstd/old_io/comm_adapters.rs +++ b/src/libstd/old_io/comm_adapters.rs @@ -191,14 +191,14 @@ mod test { let a: &[u8] = &[7,8,6]; assert_eq!(a, buf); - match reader.read(buf.as_mut_slice()) { + match reader.read(&mut buf) { Ok(..) => panic!(), Err(e) => assert_eq!(e.kind, old_io::EndOfFile), } assert_eq!(a, buf); // Ensure it continues to panic in the same way. - match reader.read(buf.as_mut_slice()) { + match reader.read(&mut buf) { Ok(..) => panic!(), Err(e) => assert_eq!(e.kind, old_io::EndOfFile), } diff --git a/src/libstd/old_io/extensions.rs b/src/libstd/old_io/extensions.rs index d729c2800ce..95284f2ca40 100644 --- a/src/libstd/old_io/extensions.rs +++ b/src/libstd/old_io/extensions.rs @@ -24,7 +24,7 @@ use option::Option; use option::Option::{Some, None}; use ptr::PtrExt; use result::Result::{Ok, Err}; -use slice::{SliceExt, AsSlice}; +use slice::SliceExt; /// An iterator that reads a single byte on each iteration, /// until `.read_byte()` returns `EndOfFile`. @@ -101,7 +101,7 @@ pub fn u64_to_le_bytes<T, F>(n: u64, size: uint, f: F) -> T where n >>= 8; i -= 1u; } - f(bytes.as_slice()) + f(&bytes) } } } @@ -140,7 +140,7 @@ pub fn u64_to_be_bytes<T, F>(n: u64, size: uint, f: F) -> T where bytes.push((n >> shift) as u8); i -= 1u; } - f(bytes.as_slice()) + f(&bytes) } } } @@ -455,7 +455,7 @@ mod test { let buf = vec![0x41, 0x02, 0x00, 0x00]; let mut writer = Vec::new(); - writer.write(buf.as_slice()).unwrap(); + writer.write(&buf).unwrap(); let mut reader = MemReader::new(writer); let f = reader.read_be_f32().unwrap(); @@ -523,7 +523,7 @@ mod bench { $b.iter(|| { let mut i = $start_index; while i < data.len() { - sum += u64_from_be_bytes(data.as_slice(), i, $size); + sum += u64_from_be_bytes(&data, i, $size); i += $stride; } }); diff --git a/src/libstd/old_io/fs.rs b/src/libstd/old_io/fs.rs index 67e3fddfd05..4e9c1b36055 100644 --- a/src/libstd/old_io/fs.rs +++ b/src/libstd/old_io/fs.rs @@ -840,7 +840,7 @@ mod test { macro_rules! error { ($e:expr, $s:expr) => ( match $e { Ok(_) => panic!("Unexpected success. Should've been: {:?}", $s), - Err(ref err) => assert!(err.to_string().contains($s.as_slice()), + Err(ref err) => assert!(err.to_string().contains($s), format!("`{}` did not contain `{}`", err, $s)) } ) } @@ -892,7 +892,7 @@ mod test { -1|0 => panic!("shouldn't happen"), n => str::from_utf8(&read_buf[..n]).unwrap().to_string() }; - assert_eq!(read_str.as_slice(), message); + assert_eq!(read_str, message); } check!(unlink(filename)); } @@ -907,7 +907,7 @@ mod test { if cfg!(unix) { error!(result, "no such file or directory"); } - error!(result, format!("path={}; mode=open; access=read", filename.display())); + error!(result, &format!("path={}; mode=open; access=read", filename.display())); } #[test] @@ -921,7 +921,7 @@ mod test { if cfg!(unix) { error!(result, "no such file or directory"); } - error!(result, format!("path={}", filename.display())); + error!(result, &format!("path={}", filename.display())); } #[test] @@ -1120,7 +1120,7 @@ mod test { None|Some("") => panic!("really shouldn't happen.."), Some(n) => format!("{}{}", prefix, n), }; - assert_eq!(expected.as_slice(), read_str); + assert_eq!(expected, read_str); } check!(unlink(f)); } @@ -1189,7 +1189,7 @@ mod test { error!(result, "couldn't recursively mkdir"); error!(result, "couldn't create directory"); error!(result, "mode=0700"); - error!(result, format!("path={}", file.display())); + error!(result, &format!("path={}", file.display())); } #[test] @@ -1255,9 +1255,9 @@ mod test { let to = Path::new("test/other-bogus-path"); error!(copy(&from, &to), - format!("couldn't copy path (the source path is not an \ - existing file; from={:?}; to={:?})", - from.display(), to.display())); + &format!("couldn't copy path (the source path is not an \ + existing file; from={:?}; to={:?})", + from.display(), to.display())); match copy(&from, &to) { Ok(..) => panic!(), @@ -1277,7 +1277,7 @@ mod test { check!(File::create(&input).write(b"hello")); check!(copy(&input, &out)); let contents = check!(File::open(&out).read_to_end()); - assert_eq!(contents.as_slice(), b"hello"); + assert_eq!(contents, b"hello"); assert_eq!(check!(input.stat()).perm, check!(out.stat()).perm); } diff --git a/src/libstd/old_io/mem.rs b/src/libstd/old_io/mem.rs index ddb364a703a..8f32703f200 100644 --- a/src/libstd/old_io/mem.rs +++ b/src/libstd/old_io/mem.rs @@ -17,7 +17,7 @@ use option::Option::None; use result::Result::{Err, Ok}; use old_io; use old_io::{Reader, Writer, Seek, Buffer, IoError, SeekStyle, IoResult}; -use slice::{self, AsSlice, SliceExt}; +use slice::{self, SliceExt}; use vec::Vec; const BUF_CAPACITY: uint = 128; @@ -92,7 +92,7 @@ impl MemWriter { /// Acquires an immutable reference to the underlying buffer of this /// `MemWriter`. #[inline] - pub fn get_ref<'a>(&'a self) -> &'a [u8] { self.buf.as_slice() } + pub fn get_ref<'a>(&'a self) -> &'a [u8] { &self.buf } /// Unwraps this `MemWriter`, returning the underlying buffer #[inline] @@ -147,7 +147,7 @@ impl MemReader { /// No method is exposed for acquiring a mutable reference to the buffer /// because it could corrupt the state of this `MemReader`. #[inline] - pub fn get_ref<'a>(&'a self) -> &'a [u8] { self.buf.as_slice() } + pub fn get_ref<'a>(&'a self) -> &'a [u8] { &self.buf } /// Unwraps this `MemReader`, returning the underlying buffer #[inline] @@ -407,7 +407,7 @@ mod test { writer.write(&[1, 2, 3]).unwrap(); writer.write(&[4, 5, 6, 7]).unwrap(); let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7]; - assert_eq!(writer.as_slice(), b); + assert_eq!(writer, b); } #[test] @@ -511,24 +511,24 @@ mod test { #[test] fn test_slice_reader() { let in_buf = vec![0, 1, 2, 3, 4, 5, 6, 7]; - let mut reader = &mut in_buf.as_slice(); + let mut reader = &mut &*in_buf; let mut buf = []; assert_eq!(reader.read(&mut buf), Ok(0)); let mut buf = [0]; assert_eq!(reader.read(&mut buf), Ok(1)); assert_eq!(reader.len(), 7); let b: &[_] = &[0]; - assert_eq!(buf.as_slice(), b); + assert_eq!(buf, b); let mut buf = [0; 4]; assert_eq!(reader.read(&mut buf), Ok(4)); assert_eq!(reader.len(), 3); let b: &[_] = &[1, 2, 3, 4]; - assert_eq!(buf.as_slice(), b); + assert_eq!(buf, b); assert_eq!(reader.read(&mut buf), Ok(3)); let b: &[_] = &[5, 6, 7]; assert_eq!(&buf[..3], b); assert!(reader.read(&mut buf).is_err()); - let mut reader = &mut in_buf.as_slice(); + let mut reader = &mut &*in_buf; assert_eq!(reader.read_until(3).unwrap(), vec!(0, 1, 2, 3)); assert_eq!(reader.read_until(3).unwrap(), vec!(4, 5, 6, 7)); assert!(reader.read(&mut buf).is_err()); @@ -537,7 +537,7 @@ mod test { #[test] fn test_buf_reader() { let in_buf = vec![0, 1, 2, 3, 4, 5, 6, 7]; - let mut reader = BufReader::new(in_buf.as_slice()); + let mut reader = BufReader::new(&in_buf); let mut buf = []; assert_eq!(reader.read(&mut buf), Ok(0)); assert_eq!(reader.tell(), Ok(0)); @@ -555,7 +555,7 @@ mod test { let b: &[_] = &[5, 6, 7]; assert_eq!(&buf[..3], b); assert!(reader.read(&mut buf).is_err()); - let mut reader = BufReader::new(in_buf.as_slice()); + let mut reader = BufReader::new(&in_buf); assert_eq!(reader.read_until(3).unwrap(), vec!(0, 1, 2, 3)); assert_eq!(reader.read_until(3).unwrap(), vec!(4, 5, 6, 7)); assert!(reader.read(&mut buf).is_err()); @@ -664,7 +664,7 @@ mod test { b.iter(|| { let mut wr = MemWriter::new(); for _ in 0..times { - wr.write(src.as_slice()).unwrap(); + wr.write(&src).unwrap(); } let v = wr.into_inner(); @@ -722,7 +722,7 @@ mod test { for _i in 0u..10 { let mut buf = [0 as u8; 10]; rdr.read(&mut buf).unwrap(); - assert_eq!(buf.as_slice(), [5; 10].as_slice()); + assert_eq!(buf, [5; 10]); } } }); diff --git a/src/libstd/old_io/mod.rs b/src/libstd/old_io/mod.rs index c9cabe648b9..c3e4e7fc80d 100644 --- a/src/libstd/old_io/mod.rs +++ b/src/libstd/old_io/mod.rs @@ -1076,7 +1076,7 @@ pub trait Writer { #[inline] fn write_char(&mut self, c: char) -> IoResult<()> { let mut buf = [0u8; 4]; - let n = c.encode_utf8(buf.as_mut_slice()).unwrap_or(0); + let n = c.encode_utf8(&mut buf).unwrap_or(0); self.write_all(&buf[..n]) } @@ -1870,7 +1870,7 @@ mod tests { // fall back on good return r.read(buf); } - match behavior.as_mut_slice()[0] { + match (&mut **behavior)[0] { GoodBehavior(0) => (), GoodBehavior(ref mut x) => { *x -= 1; diff --git a/src/libstd/old_io/process.rs b/src/libstd/old_io/process.rs index 90395142494..195d33c41a6 100644 --- a/src/libstd/old_io/process.rs +++ b/src/libstd/old_io/process.rs @@ -239,8 +239,8 @@ impl Command { // if the env is currently just inheriting from the parent's, // materialize the parent's env into a hashtable. self.env = Some(os::env_as_bytes().into_iter().map(|(k, v)| { - (EnvKey(CString::from_slice(k.as_slice())), - CString::from_slice(v.as_slice())) + (EnvKey(CString::from_slice(&k)), + CString::from_slice(&v)) }).collect()); self.env.as_mut().unwrap() } @@ -440,7 +440,7 @@ impl sys::process::ProcessConfig<EnvKey, CString> for Command { &self.program } fn args(&self) -> &[CString] { - self.args.as_slice() + &self.args } fn env(&self) -> Option<&EnvMap> { self.env.as_ref() @@ -915,7 +915,7 @@ mod tests { fn test_process_output_output() { let ProcessOutput {status, output, error} = Command::new("echo").arg("hello").output().unwrap(); - let output_str = str::from_utf8(output.as_slice()).unwrap(); + let output_str = str::from_utf8(&output).unwrap(); assert!(status.success()); assert_eq!(output_str.trim().to_string(), "hello"); @@ -956,7 +956,7 @@ mod tests { fn test_wait_with_output_once() { let prog = Command::new("echo").arg("hello").spawn().unwrap(); let ProcessOutput {status, output, error} = prog.wait_with_output().unwrap(); - let output_str = str::from_utf8(output.as_slice()).unwrap(); + let output_str = str::from_utf8(&output).unwrap(); assert!(status.success()); assert_eq!(output_str.trim().to_string(), "hello"); @@ -1049,7 +1049,7 @@ mod tests { for &(ref k, ref v) in &r { // don't check windows magical empty-named variables assert!(k.is_empty() || - output.contains(format!("{}={}", *k, *v).as_slice()), + output.contains(&format!("{}={}", *k, *v)), "output doesn't contain `{}={}`\n{}", k, v, output); } @@ -1067,12 +1067,12 @@ mod tests { for &(ref k, ref v) in &r { // don't check android RANDOM variables if *k != "RANDOM".to_string() { - assert!(output.contains(format!("{}={}", - *k, - *v).as_slice()) || - output.contains(format!("{}=\'{}\'", - *k, - *v).as_slice())); + assert!(output.contains(&format!("{}={}", + *k, + *v)) || + output.contains(&format!("{}=\'{}\'", + *k, + *v))); } } } @@ -1091,13 +1091,13 @@ mod tests { None => {} Some(val) => { path_val = val; - new_env.push(("PATH", path_val.as_slice())) + new_env.push(("PATH", &path_val)) } } - let prog = env_cmd().env_set_all(new_env.as_slice()).spawn().unwrap(); + let prog = env_cmd().env_set_all(&new_env).spawn().unwrap(); let result = prog.wait_with_output().unwrap(); - let output = String::from_utf8_lossy(result.output.as_slice()).to_string(); + let output = String::from_utf8_lossy(&result.output).to_string(); assert!(output.contains("RUN_TEST_NEW_ENV=123"), "didn't find RUN_TEST_NEW_ENV inside of:\n\n{}", output); @@ -1107,7 +1107,7 @@ mod tests { fn test_add_to_env() { let prog = env_cmd().env("RUN_TEST_NEW_ENV", "123").spawn().unwrap(); let result = prog.wait_with_output().unwrap(); - let output = String::from_utf8_lossy(result.output.as_slice()).to_string(); + let output = String::from_utf8_lossy(&result.output).to_string(); assert!(output.contains("RUN_TEST_NEW_ENV=123"), "didn't find RUN_TEST_NEW_ENV inside of:\n\n{}", output); diff --git a/src/libstd/old_io/result.rs b/src/libstd/old_io/result.rs index 96b979860ae..f42cb6ce8c9 100644 --- a/src/libstd/old_io/result.rs +++ b/src/libstd/old_io/result.rs @@ -112,7 +112,7 @@ mod test { let mut buf = [0, 0]; reader.read(&mut buf).unwrap(); let b: &[_] = &[0, 1]; - assert_eq!(buf.as_slice(), b); + assert_eq!(buf, b); } #[test] diff --git a/src/libstd/old_io/util.rs b/src/libstd/old_io/util.rs index f78e3ac1f14..5ae239014d1 100644 --- a/src/libstd/old_io/util.rs +++ b/src/libstd/old_io/util.rs @@ -101,7 +101,7 @@ impl Reader for ZeroReader { impl Buffer for ZeroReader { fn fill_buf<'a>(&'a mut self) -> old_io::IoResult<&'a [u8]> { static DATA: [u8; 64] = [0; 64]; - Ok(DATA.as_slice()) + Ok(&DATA) } fn consume(&mut self, _amt: uint) {} @@ -321,7 +321,7 @@ mod test { fn test_null_writer() { let mut s = NullWriter; let buf = vec![0, 0, 0]; - s.write_all(buf.as_slice()).unwrap(); + s.write_all(&buf).unwrap(); s.flush().unwrap(); } @@ -329,7 +329,7 @@ mod test { fn test_zero_reader() { let mut s = ZeroReader; let mut buf = vec![1, 2, 3]; - assert_eq!(s.read(buf.as_mut_slice()), Ok(3)); + assert_eq!(s.read(&mut buf), Ok(3)); assert_eq!(vec![0, 0, 0], buf); } @@ -337,7 +337,7 @@ mod test { fn test_null_reader() { let mut r = NullReader; let mut buf = vec![0]; - assert!(r.read(buf.as_mut_slice()).is_err()); + assert!(r.read(&mut buf).is_err()); } #[test] |