user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #3762 - mikerite:fix-build-20190214, r=flip1995

Browse source 
Fix breakage due to rust-lang/rust#58167
This commit is contained in:
bors 2019-02-14 13:17:48 +00:00
commit 32ee306acb
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
clippy_lints/src/cyclomatic_complexity.rs
View file

@ -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!(

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

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