Rustup
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4603c27..60a42ac 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 38fcae1..a022264 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 <manishsmail@gmail.com>",
"Andre Bogus <bogusandre@gmail.com>",
@@ -37,7 +37,7 @@
[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 e2b8d65..94f4621 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 <manishsmail@gmail.com>",
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index a0323df..8571e5b 100644
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -9,7 +9,6 @@
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 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,
}
}