Skip to content

remove some compiler warnings #22835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libcollections/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2663,15 +2663,15 @@ mod tests {
let (left, right) = values.split_at_mut(2);
{
let left: &[_] = left;
assert!(left[..left.len()] == [1, 2][]);
assert!(left[..left.len()] == [1, 2]);
}
for p in left {
*p += 1;
}

{
let right: &[_] = right;
assert!(right[..right.len()] == [3, 4, 5][]);
assert!(right[..right.len()] == [3, 4, 5]);
}
for p in right {
*p += 2;
Expand Down
4 changes: 2 additions & 2 deletions src/libcollections/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2090,15 +2090,15 @@ mod tests {
let (left, right) = values.split_at_mut(2);
{
let left: &[_] = left;
assert!(&left[..left.len()] == &[1, 2][]);
assert!(&left[..left.len()] == &[1, 2]);
}
for p in left {
*p += 1;
}

{
let right: &[_] = right;
assert!(&right[..right.len()] == &[3, 4, 5][]);
assert!(&right[..right.len()] == &[3, 4, 5]);
}
for p in right {
*p += 2;
Expand Down
6 changes: 3 additions & 3 deletions src/libcoretest/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ fn iterator_to_slice() {
let mut iter = data.iter_mut();
assert_eq!(&iter[..], &other_data[..]);
// mutability:
assert!(&mut iter[] == other_data);
assert!(&mut iter[..] == other_data);

iter.next();
assert_eq!(&iter[..], &other_data[1..]);
assert!(&mut iter[] == &mut other_data[1..]);
assert!(&mut iter[..] == &mut other_data[1..]);

iter.next_back();

assert_eq!(&iter[..], &other_data[1..2]);
assert!(&mut iter[] == &mut other_data[1..2]);
assert!(&mut iter[..] == &mut other_data[1..2]);

let s = iter.into_slice();
assert!(s == &mut other_data[1..2]);
Expand Down
3 changes: 1 addition & 2 deletions src/librustc/middle/astconv_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,11 @@ pub fn ast_ty_to_prim_ty<'tcx>(tcx: &ty::ctxt<'tcx>, ast_ty: &ast::Ty)
Some(d) => d.full_def()
};
if let def::DefPrimTy(nty) = def {
Some(prim_ty_to_ty(tcx, &path.segments[], nty))
Some(prim_ty_to_ty(tcx, &path.segments, nty))
} else {
None
}
} else {
None
}
}

2 changes: 1 addition & 1 deletion src/librustc_resolve/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2985,7 +2985,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
} else {
let msg = format!("use of undeclared trait name `{}`",
self.path_names_to_string(trait_path, path_depth));
self.resolve_error(trait_path.span, &msg[]);
self.resolve_error(trait_path.span, &msg);
Err(())
}
}
Expand Down
2 changes: 0 additions & 2 deletions src/libserialize/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3945,9 +3945,7 @@ mod tests {

#[test]
fn test_encode_hashmap_with_arbitrary_key() {
use std::old_io::Writer;
use std::collections::HashMap;
use std::fmt;
#[derive(PartialEq, Eq, Hash, RustcEncodable)]
struct ArbitraryType(uint);
let mut hm: HashMap<ArbitraryType, bool> = HashMap::new();
Expand Down
12 changes: 6 additions & 6 deletions src/libstd/io/cursor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ mod tests {
assert_eq!(writer.write(&[1, 2, 3]), Ok(3));
assert_eq!(writer.write(&[4, 5, 6, 7]), Ok(4));
let b: &[_] = &[0, 1, 2, 3, 4, 5, 6, 7];
assert_eq!(&writer.get_ref()[], b);
assert_eq!(&writer.get_ref()[..], b);
}

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

assert_eq!(writer.seek(SeekFrom::Start(0)), Ok(0));
assert_eq!(writer.position(), 0);
assert_eq!(writer.write(&[3, 4]), Ok(2));
let b: &[_] = &[3, 4, 2, 3, 4, 5, 6, 7];
assert_eq!(&writer.get_ref()[], b);
assert_eq!(&writer.get_ref()[..], b);

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

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

assert_eq!(writer.seek(SeekFrom::End(1)), Ok(10));
assert_eq!(writer.write(&[1]), Ok(1));
let b: &[_] = &[3, 4, 2, 0, 1, 5, 6, 1, 2, 0, 1];
assert_eq!(&writer.get_ref()[], b);
assert_eq!(&writer.get_ref()[..], b);
}

#[test]
Expand Down
8 changes: 4 additions & 4 deletions src/libsyntax/ast_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -760,13 +760,13 @@ mod test {
#[test] fn idents_name_eq_test() {
assert!(segments_name_eq(
&[Ident{name:Name(3),ctxt:4}, Ident{name:Name(78),ctxt:82}]
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[],
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>(),
&[Ident{name:Name(3),ctxt:104}, Ident{name:Name(78),ctxt:182}]
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[]));
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()));
assert!(!segments_name_eq(
&[Ident{name:Name(3),ctxt:4}, Ident{name:Name(78),ctxt:82}]
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[],
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>(),
&[Ident{name:Name(3),ctxt:104}, Ident{name:Name(77),ctxt:182}]
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()[]));
.iter().map(ident_to_segment).collect::<Vec<PathSegment>>()));
}
}
8 changes: 4 additions & 4 deletions src/rustbook/book.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ pub fn parse_summary<R: Reader>(input: R, src: &Path) -> Result<Book, Vec<String
}
};

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

let start_bracket = star_idx + line[star_idx..].find_str("[").unwrap();
let end_bracket = start_bracket + line[start_bracket..].find_str("](").unwrap();
let start_bracket = star_idx + line[star_idx..].find("[").unwrap();
let end_bracket = start_bracket + line[start_bracket..].find("](").unwrap();
let start_paren = end_bracket + 1;
let end_paren = start_paren + line[start_paren..].find_str(")").unwrap();
let end_paren = start_paren + line[start_paren..].find(")").unwrap();

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