Skip to content

Commit

Permalink
Upgrade to rustc 1.35.0-nightly (4c27fb19b 2019-03-25)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Mar 26, 2019
1 parent c9b5b8f commit 389e69b
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 13 deletions.
8 changes: 5 additions & 3 deletions components/script/dom/bindings/error.rs
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/webglrenderingcontext.rs
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/script_plugins/unrooted_must_root.rs
Expand Up @@ -141,7 +141,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) {
let ref map = cx.tcx.hir();
if map
.expect_item_by_hir_id(map.get_parent_item(var.node.data.hir_id()))
.expect_item_by_hir_id(map.get_parent_item(var.node.id))
.attrs
.iter()
.all(|a| !a.check_name("must_root"))
Expand Down
12 changes: 7 additions & 5 deletions components/style/bloom.rs
Expand Up @@ -14,11 +14,13 @@ use selectors::bloom::BloomFilter;
use servo_arc::Arc;
use smallvec::SmallVec;

/// Bloom filters are large allocations, so we store them in thread-local storage
/// such that they can be reused across style traversals. StyleBloom is responsible
/// for ensuring that the bloom filter is zeroed when it is dropped.
thread_local!(static BLOOM_KEY: Arc<AtomicRefCell<BloomFilter>> =
Arc::new(AtomicRefCell::new(BloomFilter::new())));
thread_local! {
/// Bloom filters are large allocations, so we store them in thread-local storage
/// such that they can be reused across style traversals. StyleBloom is responsible
/// for ensuring that the bloom filter is zeroed when it is dropped.
static BLOOM_KEY: Arc<AtomicRefCell<BloomFilter>> =
Arc::new(AtomicRefCell::new(BloomFilter::new()));
}

/// A struct that allows us to fast-reject deep descendant selectors avoiding
/// selector-matching.
Expand Down
2 changes: 1 addition & 1 deletion components/style/font_face.rs
Expand Up @@ -545,7 +545,7 @@ macro_rules! font_face_descriptors {
}
}

/// css-name rust_identifier: Type,
// css-name rust_identifier: Type,
#[cfg(feature = "gecko")]
font_face_descriptors! {
mandatory descriptors = [
Expand Down
2 changes: 1 addition & 1 deletion components/style/stylist.rs
Expand Up @@ -60,8 +60,8 @@ pub type StylistSheet = crate::stylesheets::DocumentStyleSheet;
#[cfg(feature = "gecko")]
pub type StylistSheet = crate::gecko::data::GeckoStyleSheet;

/// A cache of computed user-agent data, to be shared across documents.
lazy_static! {
/// A cache of computed user-agent data, to be shared across documents.
static ref UA_CASCADE_DATA_CACHE: Mutex<UserAgentCascadeDataCache> =
Mutex::new(UserAgentCascadeDataCache::new());
}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1 +1 @@
nightly-2019-03-03
nightly-2019-03-26

0 comments on commit 389e69b

Please sign in to comment.