Merge pull request rust-lang#652 from oli-obk/fix/nightly

WIP: fix nightly breakage

Author: llogiq

Cargo.toml

@@ -24,7 +24,7 @@ regex-syntax = "0.2.2"
 [dev-dependencies]
 compiletest_rs = "0.0.11"
 regex = "0.1.47"
-regex_macros = "0.1.27"
+regex_macros = "0.1.28"
 lazy_static = "0.1.15"
 rustc-serialize = "0.3"
 

src/approx_const.rs

@@ -2,7 +2,7 @@ use rustc::lint::*;
 use rustc_front::hir::*;
 use std::f64::consts as f64;
 use utils::span_lint;
-use syntax::ast::{Lit, Lit_, FloatTy};
+use syntax::ast::{Lit, LitKind, FloatTy};
 
 /// **What it does:** This lint checks for floating point literals that approximate constants which are defined in [`std::f32::consts`](https://doc.rust-lang.org/stable/std/f32/consts/#constants) or [`std::f64::consts`](https://doc.rust-lang.org/stable/std/f64/consts/#constants), respectively, suggesting to use the predefined constant.
 ///
@@ -55,9 +55,9 @@ impl LateLintPass for ApproxConstant {
 
 fn check_lit(cx: &LateContext, lit: &Lit, e: &Expr) {
     match lit.node {
-        Lit_::LitFloat(ref s, FloatTy::TyF32) => check_known_consts(cx, e, s, "f32"),
-        Lit_::LitFloat(ref s, FloatTy::TyF64) => check_known_consts(cx, e, s, "f64"),
-        Lit_::LitFloatUnsuffixed(ref s) => check_known_consts(cx, e, s, "f{32, 64}"),
+        LitKind::Float(ref s, FloatTy::F32) => check_known_consts(cx, e, s, "f32"),
+        LitKind::Float(ref s, FloatTy::F64) => check_known_consts(cx, e, s, "f64"),
+        LitKind::FloatUnsuffixed(ref s) => check_known_consts(cx, e, s, "f{32, 64}"),
         _ => (),
     }
 }

src/attrs.rs

@@ -6,7 +6,7 @@ use reexport::*;
 use semver::Version;
 use syntax::codemap::Span;
 use syntax::attr::*;
-use syntax::ast::{Attribute, Lit, Lit_, MetaList, MetaWord, MetaNameValue};
+use syntax::ast::{Attribute, Lit, LitKind, MetaItemKind};
 use utils::{in_macro, match_path, span_lint, BEGIN_UNWIND};
 
 /// **What it does:** This lint checks for items annotated with `#[inline(always)]`, unless the annotated function is empty or simply panics.
@@ -54,12 +54,12 @@ impl LintPass for AttrPass {
 
 impl LateLintPass for AttrPass {
     fn check_attribute(&mut self, cx: &LateContext, attr: &Attribute) {
-        if let MetaList(ref name, ref items) = attr.node.value.node {
+        if let MetaItemKind::List(ref name, ref items) = attr.node.value.node {
             if items.is_empty() || name != &"deprecated" {
                 return;
             }
             for ref item in items {
-                if let MetaNameValue(ref name, ref lit) = item.node {
+                if let MetaItemKind::NameValue(ref name, ref lit) = item.node {
                     if name == &"since" {
                         check_semver(cx, item.span, lit);
                     }
@@ -144,11 +144,11 @@ fn check_attrs(cx: &LateContext, span: Span, name: &Name, attrs: &[Attribute]) {
     }
 
     for attr in attrs {
-        if let MetaList(ref inline, ref values) = attr.node.value.node {
+        if let MetaItemKind::List(ref inline, ref values) = attr.node.value.node {
             if values.len() != 1 || inline != &"inline" {
                 continue;
             }
-            if let MetaWord(ref always) = values[0].node {
+            if let MetaItemKind::Word(ref always) = values[0].node {
                 if always != &"always" {
                     continue;
                 }
@@ -163,7 +163,7 @@ fn check_attrs(cx: &LateContext, span: Span, name: &Name, attrs: &[Attribute]) {
 }
 
 fn check_semver(cx: &LateContext, span: Span, lit: &Lit) {
-    if let Lit_::LitStr(ref is, _) = lit.node {
+    if let LitKind::Str(ref is, _) = lit.node {
         if Version::parse(&*is).is_ok() {
             return;
         }

src/bit_mask.rs

@@ -4,7 +4,7 @@ use rustc::middle::def::{Def, PathResolution};
 use rustc_front::hir::*;
 use rustc_front::util::is_comparison_binop;
 use syntax::codemap::Span;
-use syntax::ast::Lit_;
+use syntax::ast::LitKind;
 
 use utils::span_lint;
 
@@ -254,7 +254,7 @@ fn check_ineffective_gt(cx: &LateContext, span: Span, m: u64, c: u64, op: &str)
 fn fetch_int_literal(cx: &LateContext, lit: &Expr) -> Option<u64> {
     match lit.node {
         ExprLit(ref lit_ptr) => {
-            if let Lit_::LitInt(value, _) = lit_ptr.node {
+            if let LitKind::Int(value, _) = lit_ptr.node {
                 Some(value) //TODO: Handle sign
             } else {
                 None