Adapted to lastest rustc master changes

Author: denismerigoux

src/librustc_codegen_llvm/declare.rs

@@ -130,7 +130,7 @@ impl DeclareMethods<'ll, 'tcx> for CodegenCx<'ll, 'tcx, &'ll Value> {
         let fty = FnType::new(self, sig, &[]);
         let llfn = declare_raw_fn(self, name, fty.llvm_cconv(), fty.llvm_type(self));
 
-        if self.layout_of(sig.output()).abi.is_uninhabited() {
+        if self.layout_of(sig.output()).abi == layout::Abi::Uninhabited {
             llvm::Attribute::NoReturn.apply_llfn(Function, llfn);
         }
 

src/librustc_codegen_llvm/interfaces/builder.rs

@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use rustc_codegen_utils::common::{IntPredicate, RealPredicate, AtomicOrdering, SynchronizationScope, AtomicRmwBinOp, OperandBundleDef};
+use rustc_codegen_utils::common::{IntPredicate, RealPredicate, AtomicOrdering,
+    SynchronizationScope, AtomicRmwBinOp, OperandBundleDef};
 use libc::c_char;
 use rustc::ty::TyCtxt;
 use rustc::ty::layout::{Align, Size};

src/librustc_codegen_llvm/interfaces/consts.rs

@@ -41,7 +41,7 @@ pub trait ConstMethods<'ll, 'tcx: 'll> : Backend<'ll> {
     // NB: Do not use `do_spill_noroot` to make this into a constant string, or
     // you will be kicked off fast isel. See issue #4352 for an example of this.
     fn const_str_slice(&self, s: LocalInternedString) -> Self::Value;
-    
+
     fn const_fat_ptr(
         &self,
         ptr: Self::Value,

src/librustc_codegen_llvm/llvm/ffi.rs

@@ -185,7 +185,8 @@ pub enum RealPredicate {
 impl RealPredicate {
     pub fn from_generic(realpred: rustc_codegen_utils::common::RealPredicate) -> Self {
         match realpred {
-            rustc_codegen_utils::common::RealPredicate::RealPredicateFalse => RealPredicate::RealPredicateFalse,
+            rustc_codegen_utils::common::RealPredicate::RealPredicateFalse =>
+                RealPredicate::RealPredicateFalse,
             rustc_codegen_utils::common::RealPredicate::RealOEQ => RealPredicate::RealOEQ,
             rustc_codegen_utils::common::RealPredicate::RealOGT => RealPredicate::RealOGT,
             rustc_codegen_utils::common::RealPredicate::RealOGE => RealPredicate::RealOGE,
@@ -200,7 +201,8 @@ impl RealPredicate {
             rustc_codegen_utils::common::RealPredicate::RealULT => RealPredicate::RealULT,
             rustc_codegen_utils::common::RealPredicate::RealULE => RealPredicate::RealULE,
             rustc_codegen_utils::common::RealPredicate::RealUNE => RealPredicate::RealUNE,
-            rustc_codegen_utils::common::RealPredicate::RealPredicateTrue => RealPredicate::RealPredicateTrue
+            rustc_codegen_utils::common::RealPredicate::RealPredicateTrue =>
+                RealPredicate::RealPredicateTrue
         }
     }
 }
@@ -310,7 +312,8 @@ impl AtomicOrdering {
             rustc_codegen_utils::common::AtomicOrdering::Monotonic => AtomicOrdering::Monotonic,
             rustc_codegen_utils::common::AtomicOrdering::Acquire => AtomicOrdering::Acquire,
             rustc_codegen_utils::common::AtomicOrdering::Release => AtomicOrdering::Release,
-            rustc_codegen_utils::common::AtomicOrdering::AcquireRelease => AtomicOrdering::AcquireRelease,
+            rustc_codegen_utils::common::AtomicOrdering::AcquireRelease =>
+                AtomicOrdering::AcquireRelease,
             rustc_codegen_utils::common::AtomicOrdering::SequentiallyConsistent =>
                 AtomicOrdering::SequentiallyConsistent
         }
@@ -332,9 +335,12 @@ pub enum SynchronizationScope {
 impl SynchronizationScope {
     pub fn from_generic(sc : rustc_codegen_utils::common::SynchronizationScope) -> Self {
         match sc {
-            rustc_codegen_utils::common::SynchronizationScope::Other => SynchronizationScope::Other,
-            rustc_codegen_utils::common::SynchronizationScope::SingleThread => SynchronizationScope::SingleThread,
-            rustc_codegen_utils::common::SynchronizationScope::CrossThread => SynchronizationScope::CrossThread,
+            rustc_codegen_utils::common::SynchronizationScope::Other =>
+                SynchronizationScope::Other,
+            rustc_codegen_utils::common::SynchronizationScope::SingleThread =>
+                SynchronizationScope::SingleThread,
+            rustc_codegen_utils::common::SynchronizationScope::CrossThread =>
+                SynchronizationScope::CrossThread,
         }
     }
 }