Temporary bootstrapping hack: introduce syntax for r egion bounds like 'b:'a,

meaning `'b outlives 'a`. Syntax currently does nothing but is needed for full
fix to #5763. To use this syntax, the issue_5763_bootstrap feature guard is
required.
This commit is contained in:
Niko Matsakis
2014-08-05 22:59:24 -04:00
parent 1a53c00117
commit fcab98038c
19 changed files with 241 additions and 81 deletions

View File

@@ -2082,10 +2082,26 @@ impl<'a> State<'a> {
}
pub fn print_lifetime(&mut self,
lifetime: &ast::Lifetime) -> IoResult<()> {
lifetime: &ast::Lifetime)
-> IoResult<()>
{
self.print_name(lifetime.name)
}
pub fn print_lifetime_def(&mut self,
lifetime: &ast::LifetimeDef)
-> IoResult<()>
{
try!(self.print_lifetime(&lifetime.lifetime));
let mut sep = ":";
for v in lifetime.bounds.iter() {
try!(word(&mut self.s, sep));
try!(self.print_lifetime(v));
sep = "+";
}
Ok(())
}
pub fn print_generics(&mut self,
generics: &ast::Generics) -> IoResult<()> {
let total = generics.lifetimes.len() + generics.ty_params.len();
@@ -2102,7 +2118,7 @@ impl<'a> State<'a> {
|s, &idx| {
if idx < generics.lifetimes.len() {
let lifetime = generics.lifetimes.get(idx);
s.print_lifetime(lifetime)
s.print_lifetime_def(lifetime)
} else {
let idx = idx - generics.lifetimes.len();
let param = generics.ty_params.get(idx);