diff options
| author | bors <bors@rust-lang.org> | 2019-02-14 13:17:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-14 13:17:48 +0000 |
| commit | 32ee306acbf87de1d7723e95e99c0e5e56e53749 (patch) | |
| tree | b4498b7883add3548c588674cc43ddd721e3f383 | |
| parent | d4755e1f14869834242730d459b1601d961fb1c2 (diff) | |
| parent | 10811d5d89fc8a40c74c9d34173cccaacdf32ae2 (diff) | |
| download | rust-32ee306acbf87de1d7723e95e99c0e5e56e53749.tar.gz rust-32ee306acbf87de1d7723e95e99c0e5e56e53749.zip | |
Auto merge of #3762 - mikerite:fix-build-20190214, r=flip1995
Fix breakage due to rust-lang/rust#58167
| -rw-r--r-- | clippy_lints/src/cyclomatic_complexity.rs | 9 | ||||
| -rw-r--r-- | clippy_lints/src/utils/mod.rs | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/clippy_lints/src/cyclomatic_complexity.rs b/clippy_lints/src/cyclomatic_complexity.rs index 6c5c5ecbb02..76b342089bc 100644 --- a/clippy_lints/src/cyclomatic_complexity.rs +++ b/clippy_lints/src/cyclomatic_complexity.rs @@ -94,7 +94,7 @@ impl CyclomaticComplexity { short_circuits, ret_adjust, span, - body.id().node_id, + body.id().hir_id, ); } else { let mut rust_cc = cc + divergence - match_arms - short_circuits; @@ -197,7 +197,7 @@ fn report_cc_bug( shorts: u64, returns: u64, span: Span, - _: NodeId, + _: HirId, ) { span_bug!( span, @@ -220,9 +220,10 @@ fn report_cc_bug( shorts: u64, returns: u64, span: Span, - id: NodeId, + id: HirId, ) { - if !is_allowed(cx, CYCLOMATIC_COMPLEXITY, id) { + let node_id = cx.tcx.hir().hir_to_node_id(id); + if !is_allowed(cx, CYCLOMATIC_COMPLEXITY, node_id) { cx.sess().span_note_without_error( span, &format!( diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index b5221bca007..0816c209a42 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -17,7 +17,7 @@ use rustc::ty::{ Binder, Ty, TyCtxt, }; use rustc_data_structures::sync::Lrc; -use rustc_errors::{Applicability, CodeSuggestion, Substitution, SubstitutionPart}; +use rustc_errors::{Applicability, CodeSuggestion, Substitution, SubstitutionPart, SuggestionStyle}; use std::borrow::Cow; use std::env; use std::mem; @@ -745,7 +745,7 @@ where .collect(), }], msg: help_msg, - show_code_when_inline: true, + style: SuggestionStyle::ShowCode, applicability: Applicability::Unspecified, }; db.suggestions.push(sugg); |