Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +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/Cargo.toml
View file

@ -11,7 +11,7 @@ path = "lib.rs"
[features]
# servo as opposed to geckolib
servo = ["serde", "serde_macros", "ipc-channel", "app_units/plugins",
servo = ["serde", "serde_derive", "ipc-channel", "app_units/plugins",
"euclid/unstable", "url/heap_size", "url/serde", "plugins"]
[dependencies]
@ -26,7 +26,7 @@ log = "0.3.5"
num_cpus = "0.2.2"
rustc-serialize = "0.3"
serde = {version = "0.8", optional = true}
serde_macros = {version = "0.8", optional = true}
serde_derive = {version = "0.8", optional = true}
url = "1.2"
plugins = {path = "../plugins", optional = true}

6
components/util/lib.rs
View file

@ -3,10 +3,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![cfg_attr(feature = "servo", feature(custom_derive))]
#![cfg_attr(feature = "servo", feature(plugin))]
#![cfg_attr(feature = "servo", feature(nonzero))]
#![cfg_attr(feature = "servo", feature(plugin))]
#![cfg_attr(feature = "servo", feature(proc_macro))]
#![cfg_attr(feature = "servo", feature(reflect_marker))]
#![cfg_attr(feature = "servo", plugin(serde_macros))]
#![cfg_attr(feature = "servo", feature(structural_match))]
#![cfg_attr(feature = "servo", plugin(plugins))]
#![deny(unsafe_code)]
@ -23,6 +24,7 @@ extern crate getopts;
extern crate num_cpus;
extern crate rustc_serialize;
#[cfg(feature = "servo")] extern crate serde;
#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
extern crate url;
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))]
extern crate xdg;

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();