Rustup

Author: oli-obk

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)*
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.0.170"
+version = "0.0.171"
 authors = [
 	"Manish Goregaokar <[email protected]>",
 	"Andre Bogus <[email protected]>",
@@ -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"

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 <[email protected]>",

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,
     }
 }