---

yaml
---
r: 225221
b: refs/heads/stable
c: 82ded3c
h: refs/heads/master
i:
  225219: 23c8300
v: v3

Author: nikomatsakis

[refs]

@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: df93deab10850d52252829770895b0249b0d7f1e
+refs/heads/stable: 82ded3cd03e001e82b9dce9aedac621a5292231b
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/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/stable/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 {