Skip to content

Commit 0850339

Browse files
committed
Merge pull request #600 from steveklabnik/fix_build
Fix the build
2 parents ae58bd6 + 6f4efcc commit 0850339

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

examples/fn/closures/output_parameters/output_parameters.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#![feature(core)]
1+
#![feature(fnbox)]
2+
23
use std::boxed::FnBox;
34

45
// Return a closure taking no inputs and returning nothing

examples/fn/hof/hof.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(core)]
1+
#![feature(iter_arith)]
22

33
fn main() {
44
println!("Find the sum of all the squared odd numbers under 1000");

examples/std_misc/arg/args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(collections)]
1+
#![feature(slice_extras)]
22

33
use std::env;
44

examples/std_misc/arg/getopts/echo.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#![feature(rustc_private)]
2-
#![feature(collections)]
3-
#![feature(exit_status)]
2+
#![feature(slice_extras)]
43

54
extern crate getopts;
65

76
use std::env;
87
use std::io;
98
use std::io::Write;
9+
use std::process;
1010

1111
static VERSION: &'static str = "1.0.0";
1212

@@ -29,8 +29,7 @@ fn main() {
2929
Ok(m) => m,
3030
Err(f) => {
3131
println!("{}", f);
32-
env::set_exit_status(1);
33-
return;
32+
process::exit(1);
3433
// The exit code is 0 (success) by default.
3534
// Any exit code other than 0 indicates failure.
3635
}

examples/std_misc/arg/getopts/testopt.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#![feature(rustc_private)]
2-
#![feature(collections)]
3-
#![feature(exit_status)]
2+
#![feature(slice_extras)]
43

54
extern crate getopts;
65

76
use std::env;
7+
use std::process;
88

99
fn main() {
1010
let args: Vec<String> = env::args().collect();
@@ -22,15 +22,14 @@ fn main() {
2222
Ok(m) => m,
2323
Err(f) => {
2424
println!("{}", f);
25-
env::set_exit_status(1);
26-
return;
25+
process::exit(1);
2726
}
2827
};
2928
let a = if matches.opt_present("a") {true} else {false};
3029
let b = if matches.opt_present("b") {true} else {false};
3130
let c = match matches.opt_str("c") {
3231
Some(s) => s,
33-
None => String::from_str(""),
32+
None => String::from(""),
3433
};
3534
//^ Use `matches.opt_default` if you need a default (`opflagopt`).
3635
// Use `matches.opt_count` if you need to count how many were matched

examples/std_misc/simd/simd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(core)]
1+
#![feature(core_simd)]
22

33
use std::simd::f32x4;
44

examples/std_misc/simd/simd_add.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(test)]
2-
#![feature(core)]
2+
#![feature(core_simd)]
33

44
use std::simd::f32x4;
55

src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
#![feature(core)]
1+
#![feature(iter_arith)]
22
#![feature(scoped)]
33

44
#![deny(warnings)]
5+
#![allow(deprecated)] // thread::scoped needs to go, but can't do it now
56
#![feature(plugin)]
67

78
extern crate regex;

0 commit comments

Comments
 (0)