From b109e1033476390f95c728d674909ef90f0ff0ca Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Wed, 8 Aug 2018 18:00:23 +1200
Subject: [PATCH] Fix build
---
clippy_lints/src/use_self.rs | 3 +--
clippy_lints/src/utils/internal_lints.rs | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/clippy_lints/src/use_self.rs b/clippy_lints/src/use_self.rs
index 79da4c7d288..eb2b4e801eb 100644
--- a/clippy_lints/src/use_self.rs
+++ b/clippy_lints/src/use_self.rs
@@ -5,7 +5,6 @@ use rustc::hir::*;
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
use rustc::ty;
use rustc::{declare_lint, lint_array};
-use syntax::ast::NodeId;
use syntax_pos::symbol::keywords::SelfType;
/// **What it does:** Checks for unnecessary repetition of structure name when a
@@ -208,7 +207,7 @@ struct UseSelfVisitor<'a, 'tcx: 'a> {
}
impl<'a, 'tcx> Visitor<'tcx> for UseSelfVisitor<'a, 'tcx> {
- fn visit_path(&mut self, path: &'tcx Path, _id: NodeId) {
+ fn visit_path(&mut self, path: &'tcx Path, _id: HirId) {
if self.item_path.def == path.def && path.segments.last().expect(SEGMENTS_MSG).ident.name != SelfType.name() {
span_use_self_lint(self.cx, path);
}
diff --git a/clippy_lints/src/utils/internal_lints.rs b/clippy_lints/src/utils/internal_lints.rs
index 32aee099177..226817c8e51 100644
--- a/clippy_lints/src/utils/internal_lints.rs
+++ b/clippy_lints/src/utils/internal_lints.rs
@@ -5,7 +5,7 @@ use rustc::hir;
use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
use crate::utils::{match_qpath, paths, span_lint};
use syntax::symbol::LocalInternedString;
-use syntax::ast::{Crate as AstCrate, ItemKind, Name, NodeId};
+use syntax::ast::{Crate as AstCrate, ItemKind, Name};
use syntax::codemap::Span;
use std::collections::{HashMap, HashSet};
@@ -198,7 +198,7 @@ impl<'a, 'tcx: 'a> Visitor<'tcx> for LintCollector<'a, 'tcx> {
walk_expr(self, expr);
}
- fn visit_path(&mut self, path: &'tcx Path, _: NodeId) {
+ fn visit_path(&mut self, path: &'tcx Path, _: HirId) {
if path.segments.len() == 1 {
self.output.insert(path.segments[0].ident.name);
}