summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorHuon Wilson <dbau.pp+github@gmail.com>2015-01-08 11:39:45 +1100
committerHuon Wilson <dbau.pp+github@gmail.com>2015-01-08 12:27:28 +1100
commit92cd8ea96ad2a1da51863b7f089baec41ed10ce9 (patch)
tree26c6f3525c1481d5e8cd54c8c2a336ca67a1ba9b /src/libserialize
parent9f1ead8fadc56bad30dc74f5cc50d78af4fbc972 (diff)
downloadrust-92cd8ea96ad2a1da51863b7f089baec41ed10ce9.tar.gz
rust-92cd8ea96ad2a1da51863b7f089baec41ed10ce9.zip
Prohibit type parameter shadowing with a clunky hammer.
This is a [breaking-change].

Change

    impl<T> Foo<T> {
        fn bar<T>(...

to (for example)

    impl<T> Foo<T> {
        fn bar<U>(...

Per RFC 459.

Closes #19390.
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/json.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index b7bf40a6ec5..d77540b9dde 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))
     }