From 533dd360d79dc06ba857e702a4362d8aa272cdd4 Mon Sep 17 00:00:00 2001
From: Michael Wright <mikerite@lavabit.com>
Date: Thu, 14 Feb 2019 08:55:50 +0200
Subject: [PATCH 1/2] Fix breakage due to rust-lang/rust#58167
---
clippy_lints/src/cyclomatic_complexity.rs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/clippy_lints/src/cyclomatic_complexity.rs b/clippy_lints/src/cyclomatic_complexity.rs
index 6c5c5ecbb027..76b342089bc5 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!(
From 10811d5d89fc8a40c74c9d34173cccaacdf32ae2 Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Thu, 14 Feb 2019 14:01:43 +0100
Subject: [PATCH 2/2] Fix breakage from rust-lang/rust#58296
---
clippy_lints/src/utils/mod.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index b5221bca0073..0816c209a42d 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);