Rename nounwind -> unsafe_no_unwind

Author: Aatch

src/liballoc/lib.rs

@@ -98,7 +98,7 @@ pub mod rc;
 /// Common out-of-memory routine
 #[cold]
 #[inline(never)]
-#[nounwind]
+#[unsafe_no_nounwind]
 pub fn oom() -> ! {
     // FIXME(#14674): This really needs to do something other than just abort
     //                here, but any printing done must be *guaranteed* to not

src/librustc_trans/trans/base.rs

@@ -431,11 +431,6 @@ pub fn set_no_inline(f: ValueRef) {
     llvm::SetFunctionAttribute(f, llvm::NoInlineAttribute)
 }
 
-#[allow(dead_code)] // useful
-pub fn set_no_unwind(f: ValueRef) {
-    llvm::SetFunctionAttribute(f, llvm::NoUnwindAttribute)
-}
-
 // Tell LLVM to emit the information necessary to unwind the stack for the
 // function f.
 pub fn set_uwtable(f: ValueRef) {
@@ -470,7 +465,7 @@ pub fn set_llvm_fn_attrs(ccx: &CrateContext, attrs: &[ast::Attribute], llfn: Val
                                                llvm::FunctionIndex as c_uint,
                                                llvm::ColdAttribute as uint64_t)
             },
-            "nounwind" => llvm::SetFunctionAttribute(llfn, llvm::NoUnwindAttribute),
+            "unsafe_no_unwind" => llvm::SetFunctionAttribute(llfn, llvm::NoUnwindAttribute),
             _ => used = false,
         }
         if used {

src/libsyntax/feature_gate.rs

@@ -263,9 +263,9 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> {
             } else if attr.name() == "can_unwind" {
                 self.gate_feature("unwinding_attributes", i.span,
                                   "the `#[can_unwind]` attribute is an experimental feature")
-            } else if attr.name() == "nounwind" {
+            } else if attr.name() == "unsafe_no_unwind" {
                 self.gate_feature("unwinding_attributes", i.span,
-                                  "the `#[nounwind]` attribute is an experimental feature")
+                                  "the `#[unsafe_no_unwind]` attribute is an experimental feature")
             }
         }
         match i.node {