diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:30:15 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:30:15 -0800 |
| commit | 6afda64d0d2106d4afa8ebb8e0cbc504a62977be (patch) | |
| tree | e61bc93460e555f010c88417771ac59e3f1b36e2 /src/libserialize | |
| parent | 773fdb3dbec7d8d2ace01a0e2025e1592925c285 (diff) | |
| parent | 92cd8ea96ad2a1da51863b7f089baec41ed10ce9 (diff) | |
| download | rust-6afda64d0d2106d4afa8ebb8e0cbc504a62977be.tar.gz rust-6afda64d0d2106d4afa8ebb8e0cbc504a62977be.zip | |
rollup merge of #20728: huonw/type-param-shadowing
Conflicts: src/librustc_typeck/check/wf.rs
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/json.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index c6e90f32313..62acef2ca1c 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -1396,7 +1396,7 @@ impl<T: Iterator<Item=char>> Parser<T> { self.ch == Some(c) } - fn error<T>(&self, reason: ErrorCode) -> Result<T, ParserError> { + fn error<U>(&self, reason: ErrorCode) -> Result<U, ParserError> { Err(SyntaxError(reason, self.line, self.col)) } |