diff options
| -rw-r--r-- | components/net/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/net_traits/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/profile/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/script/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/script_plugins/lib.rs | 1 | ||||
| -rw-r--r-- | components/script_plugins/unrooted_must_root.rs | 14 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
7 files changed, 8 insertions, 17 deletions
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 263364b63d0..f094e817473 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "net" version = "0.0.1" diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 0bba5824d93..f4dd6bd683d 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "net_traits" version = "0.0.1" diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index 6008c31b10f..0c1abbffac7 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "profile" version = "0.0.1" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 071c429d584..56e6a586c85 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -1,5 +1,3 @@ -cargo-features = ["rename-dependency"] - [package] name = "script" version = "0.0.1" diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs index 60a087da254..7fdfb10fcce 100644 --- a/components/script_plugins/lib.rs +++ b/components/script_plugins/lib.rs @@ -14,7 +14,6 @@ //! Use this for structs that correspond to a DOM type #![deny(unsafe_code)] -#![feature(macro_at_most_once_rep)] #![feature(plugin)] #![feature(plugin_registrar)] #![feature(rustc_private)] diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index e7bc469b987..73ebcd76065 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -103,13 +103,13 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { _gen: &hir::Generics, id: ast::NodeId, ) { - let item = match cx.tcx.hir.get(id) { + let item = match cx.tcx.hir().get(id) { hir::Node::Item(item) => item, - _ => cx.tcx.hir.expect_item(cx.tcx.hir.get_parent(id)), + _ => cx.tcx.hir().expect_item(cx.tcx.hir().get_parent(id)), }; if item.attrs.iter().all(|a| !a.check_name("must_root")) { for ref field in def.fields() { - let def_id = cx.tcx.hir.local_def_id(field.id); + let def_id = cx.tcx.hir().local_def_id(field.id); if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) { cx.span_lint(UNROOTED_MUST_ROOT, field.span, "Type must be rooted, use #[must_root] on the struct definition to propagate") @@ -120,7 +120,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { /// All enums containing #[must_root] types must be #[must_root] themselves fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) { - let ref map = cx.tcx.hir; + let ref map = cx.tcx.hir(); if map .expect_item(map.get_parent(var.node.data.id())) .attrs @@ -130,7 +130,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { match var.node.data { hir::VariantData::Tuple(ref fields, _) => { for ref field in fields { - let def_id = cx.tcx.hir.local_def_id(field.id); + let def_id = cx.tcx.hir().local_def_id(field.id); if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) { cx.span_lint( UNROOTED_MUST_ROOT, @@ -164,7 +164,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { }; if !in_derive_expn(span) { - let def_id = cx.tcx.hir.local_def_id(id); + let def_id = cx.tcx.hir().local_def_id(id); let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx); for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) { @@ -262,6 +262,6 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> { fn visit_ty(&mut self, _: &'tcx hir::Ty) {} fn nested_visit_map<'this>(&'this mut self) -> hir::intravisit::NestedVisitorMap<'this, 'tcx> { - hir::intravisit::NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir) + hir::intravisit::NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir()) } } diff --git a/rust-toolchain b/rust-toolchain index 0d3073c971b..6f098ceaa7a 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2018-10-05 +nightly-2018-12-28 |