mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustup clippy build with latest rustc

Browse Source 
(breakage due to 08f8faedd0 )

Fixes #3500
This commit is contained in:
Matthias Krüger 2018-12-06 16:38:32 +01:00
parent c4ef06a9b6
commit 45cbdf471d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clippy_lints/src/use_self.rs
View File

@ -14,7 +14,7 @@
use crate::rustc::{declare_tool_lint, lint_array};
use crate::rustc_errors::Applicability;
use crate::syntax::ast::NodeId;
use crate::syntax_pos::symbol::keywords::SelfType;
use crate::syntax_pos::symbol::keywords::SelfUpper;
use crate::utils::{in_macro, span_lint_and_sugg};
use if_chain::if_chain;
@ -226,7 +226,7 @@ struct UseSelfVisitor<'a, 'tcx: 'a> {
impl<'a, 'tcx> Visitor<'tcx> for UseSelfVisitor<'a, 'tcx> {
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() {
if self.item_path.def == path.def && path.segments.last().expect(SEGMENTS_MSG).ident.name != SelfUpper.name() {
span_use_self_lint(self.cx, path);
}

2
clippy_lints/src/utils/mod.rs
View File

@ -970,7 +970,7 @@ pub fn opt_def_id(def: Def) -> Option<DefId> {
pub fn is_self(slf: &Arg) -> bool {
if let PatKind::Binding(_, _, name, _) = slf.pat.node {
name.name == keywords::SelfValue.name()
name.name == keywords::SelfLower.name()
} else {
false
}