diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-06-24 11:11:42 -0400 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2019-07-05 16:53:02 +0200 |
| commit | 43a75011be4429f0e69c65362c119f6ef5ec96d5 (patch) | |
| tree | 89def8f552e4ef8c26c0103d1d117152299379b3 /components | |
| parent | a2b76b0169bbc7691fe2dc173ce7948ee1aca876 (diff) | |
| download | servo-43a75011be4429f0e69c65362c119f6ef5ec96d5.tar.gz servo-43a75011be4429f0e69c65362c119f6ef5ec96d5.zip | |
Upgrade to rustc 1.37.0-nightly (088b98730 2019-07-03)
Diffstat (limited to 'components')
| -rw-r--r-- | components/layout/lib.rs | 1 | ||||
| -rw-r--r-- | components/layout_thread/lib.rs | 3 | ||||
| -rw-r--r-- | components/script/lib.rs | 1 | ||||
| -rw-r--r-- | components/script_plugins/unrooted_must_root.rs | 2 | ||||
| -rw-r--r-- | components/script_plugins/webidl_must_inherit.rs | 2 |
5 files changed, 5 insertions, 4 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)), }; |