Skip to content

Commit a7e1c1d

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

File tree

9 files changed

+157
-173
lines changed

9 files changed

+157
-173
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;
@@ -55,7 +54,7 @@ use vec::Vec;
5554
/// fn my_printer(s: *const libc::c_char);
5655
/// }
5756
///
58-
/// let to_print = b"Hello, world!";
57+
/// let to_print = &b"Hello, world!"[..];
5958
/// let c_to_print = CString::new(to_print).unwrap();
6059
/// unsafe {
6160
/// my_printer(c_to_print.as_ptr());
@@ -447,9 +446,6 @@ impl IntoBytes for String {
447446
impl IntoBytes for Vec<u8> {
448447
fn into_bytes(self) -> Vec<u8> { self }
449448
}
450-
impl<'a, T: FixedSizeArray<u8>> IntoBytes for &'a T {
451-
fn into_bytes(self) -> Vec<u8> { self.as_slice().to_vec() }
452-
}
453449

454450
#[cfg(test)]
455451
mod tests {
@@ -469,14 +465,14 @@ mod tests {
469465

470466
#[test]
471467
fn simple() {
472-
let s = CString::new(b"1234").unwrap();
468+
let s = CString::new("1234").unwrap();
473469
assert_eq!(s.as_bytes(), b"1234");
474470
assert_eq!(s.as_bytes_with_nul(), b"1234\0");
475471
}
476472

477473
#[test]
478474
fn build_with_zero1() {
479-
assert!(CString::new(b"\0").is_err());
475+
assert!(CString::new(&b"\0"[..]).is_err());
480476
}
481477
#[test]
482478
fn build_with_zero2() {
@@ -493,7 +489,7 @@ mod tests {
493489

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

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
@@ -926,12 +926,12 @@ mod tests {
926926

927927
#[test]
928928
fn read_until() {
929-
let mut buf = Cursor::new(b"12");
929+
let mut buf = Cursor::new(&b"12"[..]);
930930
let mut v = Vec::new();
931931
assert_eq!(buf.read_until(b'3', &mut v), Ok(2));
932932
assert_eq!(v, b"12");
933933

934-
let mut buf = Cursor::new(b"1233");
934+
let mut buf = Cursor::new(&b"1233"[..]);
935935
let mut v = Vec::new();
936936
assert_eq!(buf.read_until(b'3', &mut v), Ok(3));
937937
assert_eq!(v, b"123");
@@ -945,12 +945,12 @@ mod tests {
945945

946946
#[test]
947947
fn split() {
948-
let buf = Cursor::new(b"12");
948+
let buf = Cursor::new(&b"12"[..]);
949949
let mut s = buf.split(b'3');
950950
assert_eq!(s.next(), Some(Ok(vec![b'1', b'2'])));
951951
assert_eq!(s.next(), None);
952952

953-
let buf = Cursor::new(b"1233");
953+
let buf = Cursor::new(&b"1233"[..]);
954954
let mut s = buf.split(b'3');
955955
assert_eq!(s.next(), Some(Ok(vec![b'1', b'2'])));
956956
assert_eq!(s.next(), Some(Ok(vec![])));
@@ -959,12 +959,12 @@ mod tests {
959959

960960
#[test]
961961
fn read_line() {
962-
let mut buf = Cursor::new(b"12");
962+
let mut buf = Cursor::new(&b"12"[..]);
963963
let mut v = String::new();
964964
assert_eq!(buf.read_line(&mut v), Ok(2));
965965
assert_eq!(v, "12");
966966

967-
let mut buf = Cursor::new(b"12\n\n");
967+
let mut buf = Cursor::new(&b"12\n\n"[..]);
968968
let mut v = String::new();
969969
assert_eq!(buf.read_line(&mut v), Ok(3));
970970
assert_eq!(v, "12\n");
@@ -978,12 +978,12 @@ mod tests {
978978

979979
#[test]
980980
fn lines() {
981-
let buf = Cursor::new(b"12");
981+
let buf = Cursor::new(&b"12"[..]);
982982
let mut s = buf.lines();
983983
assert_eq!(s.next(), Some(Ok("12".to_string())));
984984
assert_eq!(s.next(), None);
985985

986-
let buf = Cursor::new(b"12\n\n");
986+
let buf = Cursor::new(&b"12\n\n"[..]);
987987
let mut s = buf.lines();
988988
assert_eq!(s.next(), Some(Ok("12".to_string())));
989989
assert_eq!(s.next(), Some(Ok(String::new())));
@@ -992,30 +992,30 @@ mod tests {
992992

993993
#[test]
994994
fn read_to_end() {
995-
let mut c = Cursor::new(b"");
995+
let mut c = Cursor::new(&b""[..]);
996996
let mut v = Vec::new();
997997
assert_eq!(c.read_to_end(&mut v), Ok(0));
998998
assert_eq!(v, []);
999999

1000-
let mut c = Cursor::new(b"1");
1000+
let mut c = Cursor::new(&b"1"[..]);
10011001
let mut v = Vec::new();
10021002
assert_eq!(c.read_to_end(&mut v), Ok(1));
10031003
assert_eq!(v, b"1");
10041004
}
10051005

10061006
#[test]
10071007
fn read_to_string() {
1008-
let mut c = Cursor::new(b"");
1008+
let mut c = Cursor::new(&b""[..]);
10091009
let mut v = String::new();
10101010
assert_eq!(c.read_to_string(&mut v), Ok(0));
10111011
assert_eq!(v, "");
10121012

1013-
let mut c = Cursor::new(b"1");
1013+
let mut c = Cursor::new(&b"1"[..]);
10141014
let mut v = String::new();
10151015
assert_eq!(c.read_to_string(&mut v), Ok(1));
10161016
assert_eq!(v, "1");
10171017

1018-
let mut c = Cursor::new(b"\xff");
1018+
let mut c = Cursor::new(&b"\xff"[..]);
10191019
let mut v = String::new();
10201020
assert!(c.read_to_string(&mut v).is_err());
10211021
}

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;
@@ -894,13 +893,6 @@ impl BytesContainer for [u8] {
894893
}
895894
}
896895

897-
impl<T: FixedSizeArray<u8>> BytesContainer for T {
898-
#[inline]
899-
fn container_as_bytes(&self) -> &[u8] {
900-
self.as_slice()
901-
}
902-
}
903-
904896
impl BytesContainer for Vec<u8> {
905897
#[inline]
906898
fn container_as_bytes(&self) -> &[u8] {

0 commit comments

Comments
 (0)