mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Auto merge of #23102 - servo:rustup, r=Manishearth
Upgrade to rustc 1.35.0-nightly (4c27fb19b 2019-03-25) <!-- 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/23102) <!-- Reviewable:end -->
This commit is contained in:
commit
5da1de6a3e
7 changed files with 17 additions and 13 deletions
|
@ -30,10 +30,12 @@ use js::rust::MutableHandleValue;
|
|||
use libc::c_uint;
|
||||
use std::slice::from_raw_parts;
|
||||
|
||||
/// An optional stringified JS backtrace and stringified native backtrace from the
|
||||
/// the last DOM exception that was reported.
|
||||
#[cfg(feature = "js_backtrace")]
|
||||
thread_local!(static LAST_EXCEPTION_BACKTRACE: DomRefCell<Option<(Option<String>, String)>> = DomRefCell::new(None));
|
||||
thread_local! {
|
||||
/// An optional stringified JS backtrace and stringified native backtrace from the
|
||||
/// the last DOM exception that was reported.
|
||||
static LAST_EXCEPTION_BACKTRACE: DomRefCell<Option<(Option<String>, String)>> = DomRefCell::new(None);
|
||||
}
|
||||
|
||||
/// DOM exceptions that can be thrown by a native DOM method.
|
||||
#[derive(Clone, Debug, MallocSizeOf)]
|
||||
|
|
|
@ -117,8 +117,8 @@ fn has_invalid_blend_constants(arg1: u32, arg2: u32) -> bool {
|
|||
}
|
||||
}
|
||||
|
||||
/// Set of bitflags for texture unpacking (texImage2d, etc...)
|
||||
bitflags! {
|
||||
/// Set of bitflags for texture unpacking (texImage2d, etc...)
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
struct TextureUnpacking: u8 {
|
||||
const FLIP_Y_AXIS = 0x01;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue