mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Auto merge of #6850 - servo:rustup_2015-07-30, r=SimonSapin
Upgrade to rustc 1.3.0-dev (87055a68c 2015-07-30) This builds and passes unit tests. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6850) <!-- Reviewable:end -->
This commit is contained in:
commit
4837dd9a1c
23 changed files with 211 additions and 106 deletions
|
@ -15,7 +15,7 @@
|
|||
#![feature(path_ext)]
|
||||
#![feature(plugin)]
|
||||
#![feature(rustc_private)]
|
||||
#![feature(slice_extras)]
|
||||
#![feature(slice_splits)]
|
||||
#![feature(step_by)]
|
||||
#![feature(step_trait)]
|
||||
#![feature(zero_one)]
|
||||
|
|
|
@ -267,8 +267,7 @@ pub fn default_opts() -> Opts {
|
|||
}
|
||||
|
||||
pub fn from_cmdline_args(args: &[String]) {
|
||||
let app_name = args[0].to_string();
|
||||
let args = args.tail();
|
||||
let (app_name, args) = args.split_first().unwrap();
|
||||
|
||||
let opts = vec!(
|
||||
getopts::optflag("c", "cpu", "CPU painting (default)"),
|
||||
|
@ -305,7 +304,7 @@ pub fn from_cmdline_args(args: &[String]) {
|
|||
};
|
||||
|
||||
if opt_match.opt_present("h") || opt_match.opt_present("help") {
|
||||
print_usage(&app_name, &opts);
|
||||
print_usage(app_name, &opts);
|
||||
process::exit(0);
|
||||
};
|
||||
|
||||
|
@ -318,11 +317,11 @@ pub fn from_cmdline_args(args: &[String]) {
|
|||
debug_options.insert(split.clone());
|
||||
}
|
||||
if debug_options.contains(&"help") {
|
||||
print_debug_usage(&app_name)
|
||||
print_debug_usage(app_name)
|
||||
}
|
||||
|
||||
let url = if opt_match.free.is_empty() {
|
||||
print_usage(&app_name, &opts);
|
||||
print_usage(app_name, &opts);
|
||||
args_fail("servo asks that you provide a URL")
|
||||
} else {
|
||||
let ref url = opt_match.free[0];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue