diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2013-03-27 12:55:18 -0400 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2013-03-27 11:35:04 -0700 |
| commit | 2a74fda316f5c4b31d3582fd1cf7b6c04c178557 (patch) | |
| tree | e38ca82517d13ab78f7a8306a87506d85175031b /src/librustc/metadata | |
| parent | 83aa70d7e3dba557d1812fe436082098cdf90c9a (diff) | |
| download | rust-2a74fda316f5c4b31d3582fd1cf7b6c04c178557.tar.gz rust-2a74fda316f5c4b31d3582fd1cf7b6c04c178557.zip | |
Fix pretty-printer test failure by carrying the bound lifetime names through
the types. Initially I thought it would be necessary to thread this data through not only the AST but the types themselves, but then I remembered that the pretty printer only cares about the AST. Regardless, I have elected to leave the changes to the types intact since they will eventually be needed. I left a few FIXMEs where it didn't seem worth finishing up since the code wasn't crucial yet.
Diffstat (limited to 'src/librustc/metadata')
| -rw-r--r-- | src/librustc/metadata/tydecode.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/librustc/metadata/tydecode.rs b/src/librustc/metadata/tydecode.rs index 8b88b39a84c..e37b3a963c4 100644 --- a/src/librustc/metadata/tydecode.rs +++ b/src/librustc/metadata/tydecode.rs @@ -24,6 +24,7 @@ use core::vec; use syntax::ast; use syntax::ast::*; use syntax::codemap::{respan, dummy_sp}; +use syntax::opt_vec; // Compact string representation for ty::t values. API ty_str & // parse_from_str. Extra parameters are for converting to/from def_ids in the @@ -479,7 +480,9 @@ fn parse_sig(st: @mut PState, conv: conv_did) -> ty::FnSig { } st.pos += 1u; // eat the ']' let ret_ty = parse_ty(st, conv); - ty::FnSig {inputs: inputs, output: ret_ty} + ty::FnSig {bound_lifetime_names: opt_vec::Empty, // FIXME(#4846) + inputs: inputs, + output: ret_ty} } // Rust metadata parsing |
