]> git.lizzy.rs Git - rust.git/commit
rollup merge of #20728: huonw/type-param-shadowing
authorAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:30:15 +0000 (17:30 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:30:15 +0000 (17:30 -0800)
commit6afda64d0d2106d4afa8ebb8e0cbc504a62977be
treee61bc93460e555f010c88417771ac59e3f1b36e2
parent773fdb3dbec7d8d2ace01a0e2025e1592925c285
parent92cd8ea96ad2a1da51863b7f089baec41ed10ce9
rollup merge of #20728: huonw/type-param-shadowing

Conflicts:
src/librustc_typeck/check/wf.rs
src/librustc_typeck/check/wf.rs
src/libserialize/json.rs