---

yaml
---
r: 214685
b: refs/heads/beta
c: 82ded3c
h: refs/heads/master
i:
  214683: ce36916
v: v3

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: df93deab10850d52252829770895b0249b0d7f1e
+refs/heads/beta: 82ded3cd03e001e82b9dce9aedac621a5292231b
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libsyntax/parse/mod.rs

@@ -923,6 +923,7 @@ mod tests {
                                 variadic: false
                             }),
                                     ast::Unsafety::Normal,
+                                    ast::Constness::NotConst,
                                     abi::Rust,
                                     ast::Generics{ // no idea on either of these:
                                         lifetimes: Vec::new(),

branches/beta/src/libsyntax/print/pprust.rs

@@ -2997,7 +2997,7 @@ impl<'a> State<'a> {
 
         match constness {
             ast::Constness::NotConst => {}
-            ast::Constness::Const => try!(self.word_nbsp("unsafe"))
+            ast::Constness::Const => try!(self.word_nbsp("const"))
         }
 
         if abi != abi::Rust {