Skip to content

Commit 8b2ff47

Browse files
committed
remove some compiler warnings
1 parent 610d169 commit 8b2ff47

File tree

9 files changed

+23
-26
lines changed

9 files changed

+23
-26
lines changed

src/libcollections/slice.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2663,15 +2663,15 @@ mod tests {
26632663
let (left, right) = values.split_at_mut(2);
26642664
{
26652665
let left: &[_] = left;
2666-
assert!(left[..left.len()] == [1, 2][]);
2666+
assert!(left[..left.len()] == [1, 2]);
26672667
}
26682668
for p in left {
26692669
*p += 1;
26702670
}
26712671

26722672
{
26732673
let right: &[_] = right;
2674-
assert!(right[..right.len()] == [3, 4, 5][]);
2674+
assert!(right[..right.len()] == [3, 4, 5]);
26752675
}
26762676
for p in right {
26772677
*p += 2;

src/libcollections/vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,15 +2090,15 @@ mod tests {
20902090
let (left, right) = values.split_at_mut(2);
20912091
{
20922092
let left: &[_] = left;
2093-
assert!(&left[..left.len()] == &[1, 2][]);
2093+
assert!(&left[..left.len()] == &[1, 2]);
20942094
}
20952095
for p in left {
20962096
*p += 1;
20972097
}
20982098

20992099
{
21002100
let right: &[_] = right;
2101-
assert!(&right[..right.len()] == &[3, 4, 5][]);
2101+
assert!(&right[..right.len()] == &[3, 4, 5]);
21022102
}
21032103
for p in right {
21042104
*p += 2;

src/libcoretest/slice.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ fn iterator_to_slice() {
5959
let mut iter = data.iter_mut();
6060
assert_eq!(&iter[..], &other_data[..]);
6161
// mutability:
62-
assert!(&mut iter[] == other_data);
62+
assert!(&mut iter[..] == other_data);
6363

6464
iter.next();
6565
assert_eq!(&iter[..], &other_data[1..]);
66-
assert!(&mut iter[] == &mut other_data[1..]);
66+
assert!(&mut iter[..] == &mut other_data[1..]);
6767

6868
iter.next_back();
6969

7070
assert_eq!(&iter[..], &other_data[1..2]);
71-
assert!(&mut iter[] == &mut other_data[1..2]);
71+
assert!(&mut iter[..] == &mut other_data[1..2]);
7272

7373
let s = iter.into_slice();
7474
assert!(s == &mut other_data[1..2]);

src/librustc/middle/astconv_util.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ pub fn ast_ty_to_prim_ty<'tcx>(tcx: &ty::ctxt<'tcx>, ast_ty: &ast::Ty)
6868
Some(d) => d.full_def()
6969
};
7070
if let def::DefPrimTy(nty) = def {
71-
Some(prim_ty_to_ty(tcx, &path.segments[], nty))
71+
Some(prim_ty_to_ty(tcx, &path.segments, nty))
7272
} else {
7373
None
7474
}
7575
} else {
7676
None
7777
}
7878
}
79-

src/librustc_resolve/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2985,7 +2985,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
29852985
} else {
29862986
let msg = format!("use of undeclared trait name `{}`",
29872987
self.path_names_to_string(trait_path, path_depth));
2988-
self.resolve_error(trait_path.span, &msg[]);
2988+
self.resolve_error(trait_path.span, &msg);
29892989
Err(())
29902990
}
29912991
}

src/libserialize/json.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3945,9 +3945,7 @@ mod tests {
39453945

39463946
#[test]
39473947
fn test_encode_hashmap_with_arbitrary_key() {
3948-
use std::old_io::Writer;
39493948
use std::collections::HashMap;
3950-
use std::fmt;
39513949
#[derive(PartialEq, Eq, Hash, RustcEncodable)]
39523950
struct ArbitraryType(uint);
39533951
let mut hm: HashMap<ArbitraryType, bool> = HashMap::new();

src/libstd/io/cursor.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ mod tests {
173173
assert_eq!(writer.write(&[1, 2, 3]), Ok(3));
174174
assert_eq!(writer.write(&[4, 5, 6, 7]), Ok(4));
175175
let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
176-
assert_eq!(&writer.get_ref()[], b);
176+
assert_eq!(&writer.get_ref()[..], b);
177177
}
178178

179179
#[test]
@@ -369,28 +369,28 @@ mod tests {
369369
assert_eq!(writer.write(&[4, 5, 6, 7]), Ok(4));
370370
assert_eq!(writer.position(), 8);
371371
let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
372-
assert_eq!(&writer.get_ref()[], b);
372+
assert_eq!(&writer.get_ref()[..], b);
373373

374374
assert_eq!(writer.seek(SeekFrom::Start(0)), Ok(0));
375375
assert_eq!(writer.position(), 0);
376376
assert_eq!(writer.write(&[3, 4]), Ok(2));
377377
let b: &[_] = &[3, 4, 2, 3, 4, 5, 6, 7];
378-
assert_eq!(&writer.get_ref()[], b);
378+
assert_eq!(&writer.get_ref()[..], b);
379379

380380
assert_eq!(writer.seek(SeekFrom::Current(1)), Ok(3));
381381
assert_eq!(writer.write(&[0, 1]), Ok(2));
382382
let b: &[_] = &[3, 4, 2, 0, 1, 5, 6, 7];
383-
assert_eq!(&writer.get_ref()[], b);
383+
assert_eq!(&writer.get_ref()[..], b);
384384

385385
assert_eq!(writer.seek(SeekFrom::End(-1)), Ok(7));
386386
assert_eq!(writer.write(&[1, 2]), Ok(2));
387387
let b: &[_] = &[3, 4, 2, 0, 1, 5, 6, 1, 2];
388-
assert_eq!(&writer.get_ref()[], b);
388+
assert_eq!(&writer.get_ref()[..], b);
389389

390390
assert_eq!(writer.seek(SeekFrom::End(1)), Ok(10));
391391
assert_eq!(writer.write(&[1]), Ok(1));
392392
let b: &[_] = &[3, 4, 2, 0, 1, 5, 6, 1, 2, 0, 1];
393-
assert_eq!(&writer.get_ref()[], b);
393+
assert_eq!(&writer.get_ref()[..], b);
394394
}
395395

396396
#[test]

src/libsyntax/ast_util.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -760,13 +760,13 @@ mod test {
760760
#[test] fn idents_name_eq_test() {
761761
assert!(segments_name_eq(
762762
&[Ident{name:Name(3),ctxt:4}, Ident{name:Name(78),ctxt:82}]
763-
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[],
763+
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>(),
764764
&[Ident{name:Name(3),ctxt:104}, Ident{name:Name(78),ctxt:182}]
765-
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[]));
765+
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()));
766766
assert!(!segments_name_eq(
767767
&[Ident{name:Name(3),ctxt:4}, Ident{name:Name(78),ctxt:82}]
768-
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[],
768+
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>(),
769769
&[Ident{name:Name(3),ctxt:104}, Ident{name:Name(77),ctxt:182}]
770-
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[]));
770+
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()));
771771
}
772772
}

src/rustbook/book.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ pub fn parse_summary<R: Reader>(input: R, src: &Path) -> Result<Book, Vec<String
114114
}
115115
};
116116

117-
let star_idx = match line.find_str("*") { Some(i) => i, None => continue };
117+
let star_idx = match line.find("*") { Some(i) => i, None => continue };
118118

119-
let start_bracket = star_idx + line[star_idx..].find_str("[").unwrap();
120-
let end_bracket = start_bracket + line[start_bracket..].find_str("](").unwrap();
119+
let start_bracket = star_idx + line[star_idx..].find("[").unwrap();
120+
let end_bracket = start_bracket + line[start_bracket..].find("](").unwrap();
121121
let start_paren = end_bracket + 1;
122-
let end_paren = start_paren + line[start_paren..].find_str(")").unwrap();
122+
let end_paren = start_paren + line[start_paren..].find(")").unwrap();
123123

124124
let given_path = &line[start_paren + 1 .. end_paren];
125125
let title = line[start_bracket + 1..end_bracket].to_string();

0 commit comments

Comments
 (0)