diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-02-05 16:42:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 16:42:51 -0500 |
| commit | b7e9bab26755c46b45ea651d30557ba7be9d89eb (patch) | |
| tree | 1de6fcf3cb57f459db8843701addd5940c22f110 | |
| parent | 9c8bce2a6b9c9164f44fcef17a7cdf60494cc119 (diff) | |
| parent | 4c2dcff80bb31bae5dcc31614fb43342f2a61550 (diff) | |
| download | servo-b7e9bab26755c46b45ea651d30557ba7be9d89eb.tar.gz servo-b7e9bab26755c46b45ea651d30557ba7be9d89eb.zip | |
Auto merge of #22823 - servo:rustup, r=SimonSapin
Compat with rustc 1.34.0-nightly (f6fac4225 2019-02-03)
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22823)
<!-- Reviewable:end -->
| -rw-r--r-- | components/script_plugins/unrooted_must_root.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script_plugins/unrooted_must_root.rs b/components/script_plugins/unrooted_must_root.rs index e1a78908033..a165632c715 100644 --- a/components/script_plugins/unrooted_must_root.rs +++ b/components/script_plugins/unrooted_must_root.rs @@ -144,7 +144,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { .all(|a| !a.check_name("must_root")) { match var.node.data { - hir::VariantData::Tuple(ref fields, _) => { + hir::VariantData::Tuple(ref fields, ..) => { for ref field in fields { let def_id = cx.tcx.hir().local_def_id(field.id); if is_unrooted_ty(cx, cx.tcx.type_of(def_id), false) { @@ -257,8 +257,8 @@ impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> { // are implemented, the `Unannotated` case could cause false-positives. // These should be fixable by adding an explicit `ref`. match pat.node { - hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, _, _, _) | - hir::PatKind::Binding(hir::BindingAnnotation::Mutable, _, _, _) => { + hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, ..) | + hir::PatKind::Binding(hir::BindingAnnotation::Mutable, ..) => { let ty = cx.tables.pat_ty(pat); if is_unrooted_ty(cx, ty, self.in_new_function) { cx.span_lint( |