Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-08 07:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #22823 - servo:rustup, r=SimonSapin

Browse source 
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 -->
This commit is contained in:
bors-servo 2019-02-05 16:42:51 -05:00 • committed by GitHub
commit b7e9bab267
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script_plugins/unrooted_must_root.rs
View file

@ -144,7 +144,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
.all(|a| !a.check_name("must_root")) .all(|a| !a.check_name("must_root"))
{ {
match var.node.data { match var.node.data {
hir::VariantData::Tuple(ref fields, _) => { hir::VariantData::Tuple(ref fields, ..) => {
for ref field in 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) { 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. // are implemented, the `Unannotated` case could cause false-positives.
// These should be fixable by adding an explicit `ref`. // These should be fixable by adding an explicit `ref`.
match pat.node { match pat.node {
hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, _, _, _) | hir::PatKind::Binding(hir::BindingAnnotation::Unannotated, ..) |
hir::PatKind::Binding(hir::BindingAnnotation::Mutable, _, _, _) => { hir::PatKind::Binding(hir::BindingAnnotation::Mutable, ..) => {
let ty = cx.tables.pat_ty(pat); let ty = cx.tables.pat_ty(pat);
if is_unrooted_ty(cx, ty, self.in_new_function) { if is_unrooted_ty(cx, ty, self.in_new_function) {
cx.span_lint( cx.span_lint(