Upgrade to rustc 1.37.0-nightly (088b98730 2019-07-03)

7 files changed, 14 insertions, 6 deletions

diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 974ef7c803b..f8afdc79190 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -3,7 +3,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #![deny(unsafe_code)]
-#![feature(type_alias_enum_variants)]
 
 #[macro_use]
 extern crate bitflags;
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
index 3e76f02c69e..3d192f6bbe6 100644
--- a/components/layout_thread/lib.rs
+++ b/components/layout_thread/lib.rs
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+// Work around https://github.com/rust-lang/rust/issues/62132
+#![recursion_limit = "128"]
+
 //! The layout thread. Performs layout on the DOM, builds display lists and sends them to be
 //! painted.
 
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 1be386dfd1c..ef1c9f5a707 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -8,7 +8,6 @@
 #![feature(inner_deref)]
 #![feature(on_unimplemented)]
 #![feature(plugin)]
-#![feature(type_alias_enum_variants)]
 #![deny(unsafe_code)]
 #![allow(non_snake_case)]
 #![doc = "The script crate contains all matters DOM."]
diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs
index 83f7a8857ab..ae278cb820d 100644
--- a/components/script_plugins/unrooted_must_root.rs
+++ b/components/script_plugins/unrooted_must_root.rs
@@ -151,7 +151,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
         _gen: &'tcx hir::Generics,
         id: HirId,
     ) {
-        let item = match cx.tcx.hir().get_by_hir_id(id) {
+        let item = match cx.tcx.hir().get(id) {
             hir::Node::Item(item) => item,
             _ => cx.tcx.hir().expect_item(cx.tcx.hir().get_parent_item(id)),
         };
diff --git a/components/script_plugins/webidl_must_inherit.rs b/components/script_plugins/webidl_must_inherit.rs
index 7670fb8378a..7706d052d4c 100644
--- a/components/script_plugins/webidl_must_inherit.rs
+++ b/components/script_plugins/webidl_must_inherit.rs
@@ -190,7 +190,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for WebIdlPass {
             return;
         }
 
-        let item = match cx.tcx.hir().get_by_hir_id(id) {
+        let item = match cx.tcx.hir().get(id) {
             hir::Node::Item(item) => item,
             _ => cx.tcx.hir().expect_item(cx.tcx.hir().get_parent_item(id)),
         };
diff --git a/etc/rustdoc-with-private b/etc/rustdoc-with-private
index cac6ef41d62..c204eb71212 100755
--- a/etc/rustdoc-with-private
+++ b/etc/rustdoc-with-private
@@ -1,7 +1,14 @@
 #!/bin/sh
+
+# Work around https://github.com/rust-lang/rust/issues/62132
+if [ "$2" = "synstructure" -o "$2" = "derivative" ]
+then
+    exit
+fi
+
 # Emit documentation for private items so it is easier to look
 # up internal definitions.
-# 
+#
 # Deny "deny warnings" to ensure documenting the crates
 # succeeds even if new warnings are introduced to the compiler.
 rustdoc -Z "unstable-options" --cap-lints warn --document-private-items "$@"
diff --git a/rust-toolchain b/rust-toolchain
index 21586c21176..bb6f6b24446 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-06-19
+nightly-2019-07-04