diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2013-11-08 20:59:43 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2013-11-08 20:59:43 -0500 |
| commit | 98f79735c3f76c9e1a263a4a37104bda51c5dd5f (patch) | |
| tree | 5159254ed7f8f7d57719acfc42527abcaeeb46fd | |
| parent | f4f4a35b5b1fe54b05b2dac3428c55ef2d3923b1 (diff) | |
| download | rust-98f79735c3f76c9e1a263a4a37104bda51c5dd5f.tar.gz rust-98f79735c3f76c9e1a263a4a37104bda51c5dd5f.zip | |
Merge failures
| -rw-r--r-- | src/librustc/metadata/tydecode.rs | 1 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/librustc/metadata/tydecode.rs b/src/librustc/metadata/tydecode.rs index 18447e6cbc8..31561e730d5 100644 --- a/src/librustc/metadata/tydecode.rs +++ b/src/librustc/metadata/tydecode.rs @@ -551,6 +551,7 @@ fn parse_sig(st: &mut PState, conv: conv_did) -> ty::FnSig { let variadic = match next(st) { 'V' => true, 'N' => false, + r => fail!(format!("Bad variadic: {}", r)), }; let ret_ty = parse_ty(st, |x,y| conv(x,y)); ty::FnSig {binder_id: id, diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index ecb178e2c97..5072a95ddcf 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -4245,7 +4245,8 @@ pub fn normalize_ty(cx: ctxt, t: t) -> t { // are erased at trans time. ty::FnSig { binder_id: ast::DUMMY_NODE_ID, inputs: ty_fold::fold_ty_vec(self, sig.inputs), - output: self.fold_ty(sig.output) } + output: self.fold_ty(sig.output), + variadic: sig.variadic } } } } @@ -4572,7 +4573,7 @@ pub fn hash_crate_independent(tcx: ctxt, t: t, local_hash: @str) -> u64 { ReEarlyBound(*) | ReLateBound(*) | ReFree(*) | - ReStatic(*) | + ReScope(*) | ReInfer(*) => { tcx.sess.bug("non-static region found when hashing a type") } |