Skip to content

Commit

Permalink
Upgrade to rustc 1.40.0-nightly (084beb83e 2019-09-27)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Sep 28, 2019
1 parent b0b01b8 commit 5b935a6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions components/script_plugins/unrooted_must_root.rs
Expand Up @@ -151,7 +151,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
{
return;
}
if let hir::ItemKind::Struct(def, ..) = &item.node {
if let hir::ItemKind::Struct(def, ..) = &item.kind {
for ref field in def.fields() {
let def_id = cx.tcx.hir().local_def_id(field.hir_id);
if is_unrooted_ty(&self.symbols, cx, cx.tcx.type_of(def_id), false) {
Expand Down Expand Up @@ -257,7 +257,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
}
};

match expr.node {
match expr.kind {
// Trait casts from #[must_root] types are not allowed
ExprKind::Cast(ref subexpr, _) => require_rooted(cx, self.in_new_function, &*subexpr),
// This catches assignments... the main point of this would be to catch mutable
Expand Down Expand Up @@ -286,7 +286,7 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> {
// When "default binding modes" https://github.com/rust-lang/rust/issues/42640
// are implemented, the `Unannotated` case could cause false-positives.
// These should be fixable by adding an explicit `ref`.
match pat.node {
match pat.kind {
hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, ..) |
hir::PatKind::Binding(hir::BindingAnnotation::Mutable, ..) => {
let ty = cx.tables.pat_ty(pat);
Expand Down
2 changes: 1 addition & 1 deletion components/script_plugins/webidl_must_inherit.rs
Expand Up @@ -177,7 +177,7 @@ impl LintPass for WebIdlPass {

impl<'a, 'tcx> LateLintPass<'a, 'tcx> for WebIdlPass {
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::Item) {
let def = match &item.node {
let def = match &item.kind {
hir::ItemKind::Struct(def, ..) => def,
_ => return,
};
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1 +1 @@
nightly-2019-09-27
nightly-2019-09-28

0 comments on commit 5b935a6

Please sign in to comment.