Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +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

6
components/script/Cargo.toml
View file

@ -52,8 +52,8 @@ num-traits = "0.1.32"
offscreen_gl_context = "0.4"
open = "1.1.1"
parking_lot = "0.3"
phf = "0.7.16"
phf_macros = "0.7.16"
phf = "0.7.17"
phf_macros = "0.7.17"
plugins = {path = "../plugins"}
profile_traits = {path = "../profile_traits"}
rand = "0.3"
@ -78,4 +78,4 @@ xml5ever = {version = "0.1.2", features = ["unstable"]}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
default_features = false
features = ["nightly", "serde_macros"]
features = ["nightly", "serde_derive"]

4
components/script/dom/bindings/cell.rs
View file

@ -106,7 +106,7 @@ impl<T> DOMRefCell<T> {
/// # Panics
///
/// Panics if this is called off the script thread.
pub fn try_borrow(&self) -> Result<Ref<T>, BorrowError<T>> {
pub fn try_borrow(&self) -> Result<Ref<T>, BorrowError> {
debug_assert!(thread_state::get().is_script());
self.value.try_borrow()
}
@ -121,7 +121,7 @@ impl<T> DOMRefCell<T> {
/// # Panics
///
/// Panics if this is called off the script thread.
pub fn try_borrow_mut(&self) -> Result<RefMut<T>, BorrowMutError<T>> {
pub fn try_borrow_mut(&self) -> Result<RefMut<T>, BorrowMutError> {
debug_assert!(thread_state::get().is_script());
self.value.try_borrow_mut()
}

1
components/script/lib.rs
View file

@ -17,7 +17,6 @@
#![feature(question_mark)]
#![feature(slice_patterns)]
#![feature(stmt_expr_attributes)]
#![feature(try_borrow)]
#![feature(try_from)]
#![feature(untagged_unions)]