Skip to content

Commit dccd17d

Browse files
committed
Remove the newly introduced trait impls for fixed-size arrays and use &b"..."[..] instead.
1 parent d2cccd0 commit dccd17d

File tree

10 files changed

+159
-175
lines changed

10 files changed

+159
-175
lines changed

src/librustc_trans/trans/debuginfo.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4054,7 +4054,7 @@ fn namespace_for_item(cx: &CrateContext, def_id: ast::DefId) -> Rc<NamespaceTree
40544054
/// .debug_gdb_scripts global is referenced, so it isn't removed by the linker.
40554055
pub fn insert_reference_to_gdb_debug_scripts_section_global(ccx: &CrateContext) {
40564056
if needs_gdb_debug_scripts_section(ccx) {
4057-
let empty = CString::new(b"").unwrap();
4057+
let empty = CString::new("").unwrap();
40584058
let gdb_debug_scripts_section_global =
40594059
get_or_insert_gdb_debug_scripts_section_global(ccx);
40604060
unsafe {

src/libstd/ffi/c_str.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![unstable(feature = "std_misc")]
1212

1313
use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
14-
use core::array::FixedSizeArray;
1514
use error::{Error, FromError};
1615
use fmt;
1716
use io;
@@ -59,7 +58,7 @@ use vec::Vec;
5958
/// fn my_printer(s: *const libc::c_char);
6059
/// }
6160
///
62-
/// let to_print = b"Hello, world!";
61+
/// let to_print = &b"Hello, world!"[..];
6362
/// let c_to_print = CString::new(to_print).unwrap();
6463
/// unsafe {
6564
/// my_printer(c_to_print.as_ptr());
@@ -451,9 +450,6 @@ impl IntoBytes for String {
451450
impl IntoBytes for Vec<u8> {
452451
fn into_bytes(self) -> Vec<u8> { self }
453452
}
454-
impl<'a, T: FixedSizeArray<u8>> IntoBytes for &'a T {
455-
fn into_bytes(self) -> Vec<u8> { self.as_slice().to_vec() }
456-
}
457453

458454
#[cfg(test)]
459455
mod tests {
@@ -473,14 +469,14 @@ mod tests {
473469

474470
#[test]
475471
fn simple() {
476-
let s = CString::new(b"1234").unwrap();
472+
let s = CString::new("1234").unwrap();
477473
assert_eq!(s.as_bytes(), b"1234");
478474
assert_eq!(s.as_bytes_with_nul(), b"1234\0");
479475
}
480476

481477
#[test]
482478
fn build_with_zero1() {
483-
assert!(CString::new(b"\0").is_err());
479+
assert!(CString::new(&b"\0"[..]).is_err());
484480
}
485481
#[test]
486482
fn build_with_zero2() {
@@ -497,7 +493,7 @@ mod tests {
497493

498494
#[test]
499495
fn formatted() {
500-
let s = CString::new(b"12").unwrap();
496+
let s = CString::new(&b"12"[..]).unwrap();
501497
assert_eq!(format!("{:?}", s), "\"12\"");
502498
}
503499

src/libstd/io/cursor.rs

+5-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use prelude::v1::*;
1212
use io::prelude::*;
1313

14-
use core::array::FixedSizeArray;
1514
use cmp;
1615
use io::{self, SeekFrom, Error, ErrorKind};
1716
use iter::repeat;
@@ -73,7 +72,7 @@ macro_rules! seek {
7372
fn seek(&mut self, style: SeekFrom) -> io::Result<u64> {
7473
let pos = match style {
7574
SeekFrom::Start(n) => { self.pos = n; return Ok(n) }
76-
SeekFrom::End(n) => self.inner.as_slice().len() as i64 + n,
75+
SeekFrom::End(n) => self.inner.len() as i64 + n,
7776
SeekFrom::Current(n) => self.pos as i64 + n,
7877
};
7978

@@ -95,7 +94,6 @@ impl<'a> io::Seek for Cursor<&'a [u8]> { seek!(); }
9594
impl<'a> io::Seek for Cursor<&'a mut [u8]> { seek!(); }
9695
#[stable(feature = "rust1", since = "1.0.0")]
9796
impl io::Seek for Cursor<Vec<u8>> { seek!(); }
98-
impl<'a, T: FixedSizeArray<u8>> io::Seek for Cursor<&'a T> { seek!(); }
9997

10098
macro_rules! read {
10199
() => {
@@ -113,13 +111,12 @@ impl<'a> Read for Cursor<&'a [u8]> { read!(); }
113111
impl<'a> Read for Cursor<&'a mut [u8]> { read!(); }
114112
#[stable(feature = "rust1", since = "1.0.0")]
115113
impl Read for Cursor<Vec<u8>> { read!(); }
116-
impl<'a, T: FixedSizeArray<u8>> Read for Cursor<&'a T> { read!(); }
117114

118115
macro_rules! buffer {
119116
() => {
120117
fn fill_buf(&mut self) -> io::Result<&[u8]> {
121-
let amt = cmp::min(self.pos, self.inner.as_slice().len() as u64);
122-
Ok(&self.inner.as_slice()[(amt as usize)..])
118+
let amt = cmp::min(self.pos, self.inner.len() as u64);
119+
Ok(&self.inner[(amt as usize)..])
123120
}
124121
fn consume(&mut self, amt: usize) { self.pos += amt as u64; }
125122
}
@@ -131,7 +128,6 @@ impl<'a> BufRead for Cursor<&'a [u8]> { buffer!(); }
131128
impl<'a> BufRead for Cursor<&'a mut [u8]> { buffer!(); }
132129
#[stable(feature = "rust1", since = "1.0.0")]
133130
impl<'a> BufRead for Cursor<Vec<u8>> { buffer!(); }
134-
impl<'a, T: FixedSizeArray<u8>> BufRead for Cursor<&'a T> { buffer!(); }
135131

136132
#[stable(feature = "rust1", since = "1.0.0")]
137133
impl<'a> Write for Cursor<&'a mut [u8]> {
@@ -332,7 +328,7 @@ mod tests {
332328

333329
#[test]
334330
fn test_read_char() {
335-
let b = b"Vi\xE1\xBB\x87t";
331+
let b = &b"Vi\xE1\xBB\x87t"[..];
336332
let mut c = Cursor::new(b).chars();
337333
assert_eq!(c.next(), Some(Ok('V')));
338334
assert_eq!(c.next(), Some(Ok('i')));
@@ -343,7 +339,7 @@ mod tests {
343339

344340
#[test]
345341
fn test_read_bad_char() {
346-
let b = b"\x80";
342+
let b = &b"\x80"[..];
347343
let mut c = Cursor::new(b).chars();
348344
assert!(c.next().unwrap().is_err());
349345
}

src/libstd/io/mod.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -933,12 +933,12 @@ mod tests {
933933

934934
#[test]
935935
fn read_until() {
936-
let mut buf = Cursor::new(b"12");
936+
let mut buf = Cursor::new(&b"12"[..]);
937937
let mut v = Vec::new();
938938
assert_eq!(buf.read_until(b'3', &mut v), Ok(2));
939939
assert_eq!(v, b"12");
940940

941-
let mut buf = Cursor::new(b"1233");
941+
let mut buf = Cursor::new(&b"1233"[..]);
942942
let mut v = Vec::new();
943943
assert_eq!(buf.read_until(b'3', &mut v), Ok(3));
944944
assert_eq!(v, b"123");
@@ -952,12 +952,12 @@ mod tests {
952952

953953
#[test]
954954
fn split() {
955-
let buf = Cursor::new(b"12");
955+
let buf = Cursor::new(&b"12"[..]);
956956
let mut s = buf.split(b'3');
957957
assert_eq!(s.next(), Some(Ok(vec![b'1', b'2'])));
958958
assert_eq!(s.next(), None);
959959

960-
let buf = Cursor::new(b"1233");
960+
let buf = Cursor::new(&b"1233"[..]);
961961
let mut s = buf.split(b'3');
962962
assert_eq!(s.next(), Some(Ok(vec![b'1', b'2'])));
963963
assert_eq!(s.next(), Some(Ok(vec![])));
@@ -966,12 +966,12 @@ mod tests {
966966

967967
#[test]
968968
fn read_line() {
969-
let mut buf = Cursor::new(b"12");
969+
let mut buf = Cursor::new(&b"12"[..]);
970970
let mut v = String::new();
971971
assert_eq!(buf.read_line(&mut v), Ok(2));
972972
assert_eq!(v, "12");
973973

974-
let mut buf = Cursor::new(b"12\n\n");
974+
let mut buf = Cursor::new(&b"12\n\n"[..]);
975975
let mut v = String::new();
976976
assert_eq!(buf.read_line(&mut v), Ok(3));
977977
assert_eq!(v, "12\n");
@@ -985,12 +985,12 @@ mod tests {
985985

986986
#[test]
987987
fn lines() {
988-
let buf = Cursor::new(b"12");
988+
let buf = Cursor::new(&b"12"[..]);
989989
let mut s = buf.lines();
990990
assert_eq!(s.next(), Some(Ok("12".to_string())));
991991
assert_eq!(s.next(), None);
992992

993-
let buf = Cursor::new(b"12\n\n");
993+
let buf = Cursor::new(&b"12\n\n"[..]);
994994
let mut s = buf.lines();
995995
assert_eq!(s.next(), Some(Ok("12".to_string())));
996996
assert_eq!(s.next(), Some(Ok(String::new())));
@@ -999,30 +999,30 @@ mod tests {
999999

10001000
#[test]
10011001
fn read_to_end() {
1002-
let mut c = Cursor::new(b"");
1002+
let mut c = Cursor::new(&b""[..]);
10031003
let mut v = Vec::new();
10041004
assert_eq!(c.read_to_end(&mut v), Ok(0));
10051005
assert_eq!(v, []);
10061006

1007-
let mut c = Cursor::new(b"1");
1007+
let mut c = Cursor::new(&b"1"[..]);
10081008
let mut v = Vec::new();
10091009
assert_eq!(c.read_to_end(&mut v), Ok(1));
10101010
assert_eq!(v, b"1");
10111011
}
10121012

10131013
#[test]
10141014
fn read_to_string() {
1015-
let mut c = Cursor::new(b"");
1015+
let mut c = Cursor::new(&b""[..]);
10161016
let mut v = String::new();
10171017
assert_eq!(c.read_to_string(&mut v), Ok(0));
10181018
assert_eq!(v, "");
10191019

1020-
let mut c = Cursor::new(b"1");
1020+
let mut c = Cursor::new(&b"1"[..]);
10211021
let mut v = String::new();
10221022
assert_eq!(c.read_to_string(&mut v), Ok(1));
10231023
assert_eq!(v, "1");
10241024

1025-
let mut c = Cursor::new(b"\xff");
1025+
let mut c = Cursor::new(&b"\xff"[..]);
10261026
let mut v = String::new();
10271027
assert!(c.read_to_string(&mut v).is_err());
10281028
}

src/libstd/old_io/process.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@ mod tests {
12311231
cmd.env("path", "foo");
12321232
cmd.env("Path", "bar");
12331233
let env = &cmd.env.unwrap();
1234-
let val = env.get(&EnvKey(CString::new(b"PATH").unwrap()));
1235-
assert!(val.unwrap() == &CString::new(b"bar").unwrap());
1234+
let val = env.get(&EnvKey(CString::new("PATH").unwrap()));
1235+
assert!(val.unwrap() == &CString::new("bar").unwrap());
12361236
}
12371237
}

src/libstd/old_path/mod.rs

-8
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
#![allow(deprecated)] // seriously this is all deprecated
6565
#![allow(unused_imports)]
6666

67-
use core::array::FixedSizeArray;
6867
use core::marker::Sized;
6968
use ffi::CString;
7069
use clone::Clone;
@@ -896,13 +895,6 @@ impl BytesContainer for [u8] {
896895
}
897896
}
898897

899-
impl<T: FixedSizeArray<u8>> BytesContainer for T {
900-
#[inline]
901-
fn container_as_bytes(&self) -> &[u8] {
902-
self.as_slice()
903-
}
904-
}
905-
906898
impl BytesContainer for Vec<u8> {
907899
#[inline]
908900
fn container_as_bytes(&self) -> &[u8] {

0 commit comments

Comments
 (0)