about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-16 20:31:25 -0700
committerbors <bors@rust-lang.org>2014-04-16 20:31:25 -0700
commit1dec47711dc145fdfd675497fb6adb8ff80354ad (patch)
tree35ac010c837adafe0b2187a088db795a687f07aa /src/rustllvm/RustWrapper.cpp
parent9f3fd9337dc57cd98b03fb1ddc827750c7222420 (diff)
parentdaa1f5099f96170a290b5a5249041a8c6a8beaed (diff)
downloadrust-1dec47711dc145fdfd675497fb6adb8ff80354ad.tar.gz
rust-1dec47711dc145fdfd675497fb6adb8ff80354ad.zip
auto merge of #13503 : edwardw/rust/lifetime-ice, r=nikomatsakis
When instantiating trait default methods for certain implementation,
`typeck` correctly combined type parameters from trait bound with those
from method bound, but didn't do so for lifetime parameters. Applies
the same logic to lifetime parameters.

Closes #13204
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions