Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 12:10:29 +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/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()
}