Fix remaining test failures (constant visibility pretty-printing and make-tidy).

Author: quantheory

src/libsyntax/print/pprust.rs

@@ -795,9 +795,11 @@ impl<'a> State<'a> {
     fn print_associated_const(&mut self,
                               ident: ast::Ident,
                               ty: &ast::Ty,
-                              default: Option<&ast::Expr>)
+                              default: Option<&ast::Expr>,
+                              vis: ast::Visibility)
                               -> io::Result<()>
     {
+        try!(word(&mut self.s, &visibility_qualified(vis, "")));
         try!(self.word_space("const"));
         try!(self.print_ident(ident));
         try!(self.word_space(":"));
@@ -1284,7 +1286,8 @@ impl<'a> State<'a> {
         match ti.node {
             ast::ConstTraitItem(ref ty, ref default) => {
                 self.print_associated_const(ti.ident, &ty,
-                                            default.as_ref().map(|expr| &**expr))
+                                            default.as_ref().map(|expr| &**expr),
+                                            ast::Inherited)
             }
             ast::MethodTraitItem(ref sig, ref body) => {
                 if body.is_some() {
@@ -1311,7 +1314,7 @@ impl<'a> State<'a> {
         try!(self.print_outer_attributes(&ii.attrs));
         match ii.node {
             ast::ConstImplItem(ref ty, ref expr) => {
-                self.print_associated_const(ii.ident, &ty, Some(&expr))
+                self.print_associated_const(ii.ident, &ty, Some(&expr), ii.vis)
             }
             ast::MethodImplItem(ref sig, ref body) => {
                 try!(self.head(""));

src/test/parse-fail/removed-syntax-static-fn.rs

@@ -12,5 +12,5 @@ struct S;
 
 impl S {
     static fn f() {}
-    //~^ ERROR expected one of `const`, `extern`, `fn`, `pub`, `type`, `unsafe`, or `}`, found `static`
 }
+//~^^ ERROR expected one of `const`, `extern`, `fn`, `pub`, `type`, `unsafe`, or `}`, found `static`