mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build

Browse source
This commit is contained in:
Nick Cameron 2018-08-08 18:00:23 +12:00
parent 328fea3e0d
commit b109e10334
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clippy_lints/src/use_self.rs
View file

@ -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);
}

4
clippy_lints/src/utils/internal_lints.rs
View file

@ -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);
}