bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge remote-tracking branch 'rust-lang/master'

Browse source 
Conflicts:
	src/libcore/cell.rs
	src/librustc_driver/test.rs
	src/libstd/old_io/net/tcp.rs
	src/libstd/old_io/process.rs
This commit is contained in:
Brian Anderson 2015-01-27 09:38:30 -08:00
commit 7122305053
219 changed files with 1892 additions and 1432 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/compile-fail/lint-uppercase-variables.rs
View file

@ -15,8 +15,8 @@
#![feature(path)]
#![feature(io)]
use std::io::File;
use std::io::IoError;
use std::old_io::File;
use std::old_io::IoError;
struct Something {
X: usize //~ ERROR structure field `X` should have a snake case name such as `x`
@ -36,7 +36,7 @@ fn main() {
Ok(cnt) => println!("read this many bytes: {}", cnt),
Err(IoError{ kind: EndOfFile, .. }) => println!("Got end of file: {:?}", EndOfFile),
//~^ ERROR variable `EndOfFile` should have a snake case name such as `end_of_file`
//~^^ WARN `EndOfFile` is named the same as one of the variants of the type `std::io::IoErrorKind`
//~^^ WARN `EndOfFile` is named the same as one of the variants of the type `std::old_io::IoErrorKind`
}
test(1);