auto merge of #14073 : alexcrichton/rust/snapshots, r=huonw

2 files changed, 2 insertions, 8 deletions

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 8f3b77dd58c..46a8960c3be 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -907,12 +907,6 @@ impl<'a> Parser<'a> {
             abi::Rust
         };
 
-        // NOTE: remove after a stage0 snapshot
-        let fn_style = match self.parse_unsafety() {
-            UnsafeFn => UnsafeFn,
-            NormalFn => fn_style,
-        };
-
         self.expect_keyword(keywords::Fn);
         let (decl, lifetimes) = self.parse_ty_fn_decl(true);
         return TyBareFn(@BareFnTy {
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 510ec2a370f..8486a8aeb35 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -2087,13 +2087,13 @@ impl<'a> State<'a> {
         if opt_sigil == Some('~') && onceness == ast::Once {
             try!(word(&mut self.s, "proc"));
         } else if opt_sigil == Some('&') {
-            try!(self.print_extern_opt_abi(opt_abi));
             try!(self.print_fn_style(fn_style));
+            try!(self.print_extern_opt_abi(opt_abi));
             try!(self.print_onceness(onceness));
         } else {
             assert!(opt_sigil.is_none());
-            try!(self.print_opt_abi_and_extern_if_nondefault(opt_abi));
             try!(self.print_fn_style(fn_style));
+            try!(self.print_opt_abi_and_extern_if_nondefault(opt_abi));
             try!(self.print_onceness(onceness));
             try!(word(&mut self.s, "fn"));
         }