Skip to content

Commit

Permalink
Upgrade to rustc 1.33.0-nightly (fb86d604b 2018-12-27)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Dec 28, 2018
1 parent ec846e3 commit 82fc6d9
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 17 deletions.
2 changes: 0 additions & 2 deletions components/net/Cargo.toml
@@ -1,5 +1,3 @@
cargo-features = ["rename-dependency"]

[package]
name = "net"
version = "0.0.1"
Expand Down
2 changes: 0 additions & 2 deletions components/net_traits/Cargo.toml
@@ -1,5 +1,3 @@
cargo-features = ["rename-dependency"]

[package]
name = "net_traits"
version = "0.0.1"
Expand Down
2 changes: 0 additions & 2 deletions components/profile/Cargo.toml
@@ -1,5 +1,3 @@
cargo-features = ["rename-dependency"]

[package]
name = "profile"
version = "0.0.1"
Expand Down
2 changes: 0 additions & 2 deletions components/script/Cargo.toml
@@ -1,5 +1,3 @@
cargo-features = ["rename-dependency"]

[package]
name = "script"
version = "0.0.1"
Expand Down
1 change: 0 additions & 1 deletion components/script_plugins/lib.rs
Expand Up @@ -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)]
Expand Down
14 changes: 7 additions & 7 deletions components/script_plugins/unrooted_must_root.rs
Expand Up @@ -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")
Expand All @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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())
}
}
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1 +1 @@
nightly-2018-10-05
nightly-2018-12-28

0 comments on commit 82fc6d9

Please sign in to comment.