about summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-12 21:04:41 +0000
committerbors <bors@rust-lang.org>2017-11-12 21:04:41 +0000
commit79cfce3d35cc8c2716c65650389d79551c2ea6ea (patch)
treee59329d77e17421c16a10445d112db03c3aa6df4 /src/rustllvm/RustWrapper.cpp
parentfb5ba4ef90bda82b4aa7328927d4413c7f33683d (diff)
parentf53fc572978b7a544bedeb819aa656f0aef96e11 (diff)
downloadrust-79cfce3d35cc8c2716c65650389d79551c2ea6ea.tar.gz
rust-79cfce3d35cc8c2716c65650389d79551c2ea6ea.zip
Auto merge of #44167 - cengizIO:master, r=nikomatsakis
Improve SubSupConflict with a named and an anonymous lifetime parameter #42701

Hello!

This fixes #42701.

## UPDATE 01
Tests are producing different results between different env builds.
This inconsistency might take a long time to investigate and fix. So, be patient

## UPDATE 02
Changed an `FxHashMap` with a `BTreeMap`. Inconsistency seems to be resolved for now.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions