about summary refs log tree commit diff
path: root/src/liballoc_jemalloc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-08 03:03:25 +0000
committerbors <bors@rust-lang.org>2018-04-08 03:03:25 +0000
commit66fcc564442cdbb3c94a0aeb4bba478a70fdd1eb (patch)
treeefe91819394f43cf35cdaac5437b4e410e50f88c /src/liballoc_jemalloc
parent08ad376e48dba27f906d28c94bc6703f74e3f523 (diff)
parent939bb32883b64b99886c0e724a122c176bb084ba (diff)
downloadrust-66fcc564442cdbb3c94a0aeb4bba478a70fdd1eb.tar.gz
rust-66fcc564442cdbb3c94a0aeb4bba478a70fdd1eb.zip
Auto merge of #49714 - nikomatsakis:issue-49631, r=eddyb
mem-categorization, coherence fix

make mem-categorization use adjusted type for patterns: Fixes #49631

do not propagate `Err` when determing causal info: Fixes #48728

r? @eddyb
Diffstat (limited to 'src/liballoc_jemalloc')
0 files changed, 0 insertions, 0 deletions