about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-16 15:25:59 +0000
committerbors <bors@rust-lang.org>2014-09-16 15:25:59 +0000
commit946654a721d6fd5eeb91e93293cdc2cba83c78b9 (patch)
tree284ceef62c9e2c207acb9c497cadfa53f59994b3 /src/liballoc
parentcdd46f8592a0ca7eb69110bff0569094951ccc67 (diff)
parenteafeb335a0731b4bfcd8be6203d0d29a3668cd76 (diff)
downloadrust-946654a721d6fd5eeb91e93293cdc2cba83c78b9.tar.gz
rust-946654a721d6fd5eeb91e93293cdc2cba83c78b9.zip
auto merge of #17197 : nikomatsakis/rust/issue-5527-trait-reform-revisited, r=pcwalton
This patch does not make many functional changes, but does a lot of restructuring towards the goals of #5527. This is the biggest patch, basically, that should enable most of the other patches in a relatively straightforward way.

Major changes:

- Do not track impls through trans, instead recompute as needed.
- Isolate trait matching code into its own module, carefully structure to distinguish various phases (selection vs confirmation vs fulfillment)
- Consider where clauses in their more general form
- Integrate checking of builtin bounds into the  trait matching process, rather than doing it separately in kind.rs (important for opt-in builtin bounds)

What is not included:

- Where clauses are still not generalized. This should be a straightforward follow-up patch.
- Caching. I did not include much caching. I have plans for various kinds of caching we can do. Should be straightforward. Preliminary perf measurements suggested that this branch keeps compilation times roughly what they are.
- Method resolution. The initial algorithm I proposed for #5527 does not work as well as I hoped. I have a revised plan which is much more similar to what we do today.
- Deref vs deref-mut. The initial fix I had worked great for autoderef, but not for explicit deref. 
- Permitting blanket impls to overlap with specific impls. Initial plan to consider all nested obligations before considering an impl to match caused many compilation errors. We have a revised plan but it is not implemented here, should be a relatively straightforward extension.
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/heap.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index f1780b07271..2905b30deeb 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -238,7 +238,6 @@ mod imp {
 #[cfg(not(jemalloc), unix)]
 mod imp {
     use core::cmp;
-    use core::mem;
     use core::ptr;
     use libc;
     use libc_heap;