auto merge of #5483 : pcwalton/rust/static-syntax, r=graydon

r? @nikomatsakis
2013-03-22 11:21:48 -07:00
parent f011f928dd 94327d00c6
commit b6f9aa1fd7
14 changed files with 60 additions and 57 deletions
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -1755,7 +1755,7 @@ pub fn print_bounds(s: @ps, bounds: @OptVec<ast::TyParamBound>) {

            match *bound {
                TraitTyParamBound(ty) => print_type(s, ty),
-                RegionTyParamBound => word(s.s, ~"&static"),
+                RegionTyParamBound => word(s.s, ~"'static"),
            }
        }
    }