diff options
| author | bors <bors@rust-lang.org> | 2015-10-26 21:23:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-26 21:23:32 +0000 |
| commit | 04475b92f9309356a90fe970816774d14ef5b4ed (patch) | |
| tree | a58af9f0164fc9dffae9a69e925bc840ed13d4b6 /src/libsyntax/print | |
| parent | 2c42c9881542a0f3a8b573a56cd1c12643d4be52 (diff) | |
| parent | f9b8c49cdb75fb571c7b3ea4af90b0e96929276c (diff) | |
| download | rust-04475b92f9309356a90fe970816774d14ef5b4ed.tar.gz rust-04475b92f9309356a90fe970816774d14ef5b4ed.zip | |
Auto merge of #29274 - thepowersgang:issues-29107-const-unsafe-fn-order, r=nikomatsakis
This PR switches the implemented ordering from `unsafe const fn` (as was in the original RFC) to `const unsafe fn` (which is what the lang team decided on)
Diffstat (limited to 'src/libsyntax/print')
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 397293f61ca..87cecdba28e 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -3058,13 +3058,14 @@ impl<'a> State<'a> { abi: abi::Abi, vis: ast::Visibility) -> io::Result<()> { try!(word(&mut self.s, &visibility_qualified(vis, ""))); - try!(self.print_unsafety(unsafety)); match constness { ast::Constness::NotConst => {} ast::Constness::Const => try!(self.word_nbsp("const")) } + try!(self.print_unsafety(unsafety)); + if abi != abi::Rust { try!(self.word_nbsp("extern")); try!(self.word_nbsp(&abi.to_string())); |
