From c6a4eaeb0d574b92b167fb8bbff02539ea8af3b1 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Wed, 15 Nov 2017 08:38:43 +0100 Subject: [PATCH] Rustup --- CHANGELOG.md | 3 +++ Cargo.toml | 4 ++-- clippy_lints/Cargo.toml | 2 +- clippy_lints/src/utils/mod.rs | 7 +++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4603c27e266..60a42ac1f9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Change Log All notable changes to this project will be documented in this file. +## 0.0.171 +* Rustup to *rustc 1.23.0-nightly (ff0f5de3b 2017-11-14)* + ## 0.0.170 * Rustup to *rustc 1.23.0-nightly (d6b06c63a 2017-11-09)* diff --git a/Cargo.toml b/Cargo.toml index 38fcae19354..a022264985d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clippy" -version = "0.0.170" +version = "0.0.171" authors = [ "Manish Goregaokar ", "Andre Bogus ", @@ -37,7 +37,7 @@ path = "src/driver.rs" [dependencies] # begin automatic update -clippy_lints = { version = "0.0.170", path = "clippy_lints" } +clippy_lints = { version = "0.0.171", path = "clippy_lints" } # end automatic update cargo_metadata = "0.2" regex = "0.2" diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml index e2b8d654682..94f4621987f 100644 --- a/clippy_lints/Cargo.toml +++ b/clippy_lints/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "clippy_lints" # begin automatic update -version = "0.0.170" +version = "0.0.171" # end automatic update authors = [ "Manish Goregaokar ", diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index a0323df1f62..8571e5bb563 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -9,7 +9,6 @@ use rustc::lint::{LateContext, Level, Lint, LintContext}; use rustc::session::Session; use rustc::traits; use rustc::ty::{self, Ty, TyCtxt}; -use rustc::mir::transform::MirSource; use rustc_errors; use std::borrow::Cow; use std::env; @@ -48,9 +47,9 @@ pub fn differing_macro_contexts(lhs: Span, rhs: Span) -> bool { pub fn in_constant(cx: &LateContext, id: NodeId) -> bool { let parent_id = cx.tcx.hir.get_parent(id); - match MirSource::from_node(cx.tcx, parent_id) { - MirSource::GeneratorDrop(_) | MirSource::Fn(_) => false, - MirSource::Const(_) | MirSource::Static(..) | MirSource::Promoted(..) => true, + match cx.tcx.hir.body_owner_kind(parent_id) { + hir::BodyOwnerKind::Fn => false, + hir::BodyOwnerKind::Const | hir::BodyOwnerKind::Static(..) => true, } }