diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
index 6153f167df5..fdce3f01065 100644
--- a/components/script/dom/bindings/error.rs
+++ b/components/script/dom/bindings/error.rs
@@ -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)]
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index c0966ab8cc7..3100fbf942d 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -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;
diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs
index c55fcebe405..4babfe49f3a 100644
--- a/components/script_plugins/unrooted_must_root.rs
+++ b/components/script_plugins/unrooted_must_root.rs
@@ -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"))
diff --git a/components/style/bloom.rs b/components/style/bloom.rs
index 92e6b2a48b4..4e6ae471e50 100644
--- a/components/style/bloom.rs
+++ b/components/style/bloom.rs
@@ -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.
diff --git a/components/style/font_face.rs b/components/style/font_face.rs
index 38c4bb78833..85dea932173 100644
--- a/components/style/font_face.rs
+++ b/components/style/font_face.rs
@@ -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 = [
diff --git a/components/style/stylist.rs b/components/style/stylist.rs
index a0d33ab02bf..982440004ec 100644
--- a/components/style/stylist.rs
+++ b/components/style/stylist.rs
@@ -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());
 }
diff --git a/rust-toolchain b/rust-toolchain
index 46234a579b4..edaeac53761 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-03-03
+nightly-2019-03-26