From 698027c4c423ca5cd5696a2a0b72a443abefb429 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Wed, 2 Mar 2016 15:37:20 +0000
Subject: [PATCH 1/2] Fix ordering of "const unsafe fn"

---
 src/items.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/items.rs b/src/items.rs
index c013733f37f..9e5b964429e 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -1078,12 +1078,13 @@ fn rewrite_fn_base(context: &RewriteContext,
     let mut result = String::with_capacity(1024);
     // Vis unsafety abi.
     result.push_str(format_visibility(vis));
-    result.push_str(::utils::format_unsafety(unsafety));
 
     if let ast::Constness::Const = constness {
         result.push_str("const ");
     }
 
+    result.push_str(::utils::format_unsafety(unsafety));
+
     if abi != abi::Abi::Rust {
         result.push_str(&::utils::format_abi(abi));
     }

From ef03dcaa7fd2abad8c3718a7f451e9d990d8f776 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Thu, 3 Mar 2016 04:45:47 +0000
Subject: [PATCH 2/2] Add a test for #850

---
 tests/source/issue-850.rs | 1 +
 tests/target/issue-850.rs | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 tests/source/issue-850.rs
 create mode 100644 tests/target/issue-850.rs

diff --git a/tests/source/issue-850.rs b/tests/source/issue-850.rs
new file mode 100644
index 00000000000..c939716a6a8
--- /dev/null
+++ b/tests/source/issue-850.rs
@@ -0,0 +1 @@
+const unsafe fn x() {}
diff --git a/tests/target/issue-850.rs b/tests/target/issue-850.rs
new file mode 100644
index 00000000000..c939716a6a8
--- /dev/null
+++ b/tests/target/issue-850.rs
@@ -0,0 +1 @@
+const unsafe fn x() {}