Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13649 - servo:rustup, r=larsbergstrom

Browse source 
Update to Rust 1.14.0-nightly (19ac57926 2016-10-08)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13649)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-09 20:12:38 -05:00 • committed by GitHub
commit 39d3fce1af
47 changed files with 390 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/util/opts.rs
View file

@ -789,9 +789,9 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
let url = Url::from_file_path(&path).unwrap();
let mut contents = Vec::new();
File::open(path)
.unwrap_or_else(|err| args_fail(&format!("Couldn’t open {}: {}", filename, err)))
.unwrap_or_else(|err| args_fail(&format!("Couldn't open {}: {}", filename, err)))
.read_to_end(&mut contents)
.unwrap_or_else(|err| args_fail(&format!("Couldn’t read {}: {}", filename, err)));
.unwrap_or_else(|err| args_fail(&format!("Couldn't read {}: {}", filename, err)));
(contents, url)
}).collect();