diff options
| author | bors <bors@rust-lang.org> | 2013-07-20 10:55:34 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-20 10:55:34 -0700 |
| commit | 5c999d4ecac0b4fb4b64c3e174f89bb5165abfd3 (patch) | |
| tree | 4b39e15a052cec1cd0fb69fb911a7b7ca0641c59 /src/libsyntax | |
| parent | 8aae6edce09a8e2a32a154acb55c9879dbebf99c (diff) | |
| parent | 9089cf2ec9297a3b558d24352cde6a5206a08444 (diff) | |
auto merge of #7894 : pcwalton/rust/and-pointers-in-at-boxes, r=brson
r? @brson
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/util/interner.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 230640767c9..2f86a0460d1 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -414,8 +414,7 @@ pub enum MapChain<K,V> { // get the map from an env frame -impl <K: Eq + Hash + IterBytes, V> MapChain<K,V>{ - +impl <K: Eq + Hash + IterBytes + 'static, V: 'static> MapChain<K,V>{ // Constructor. I don't think we need a zero-arg one. fn new(init: ~HashMap<K,@V>) -> @mut MapChain<K,V> { @mut BaseMapChain(init) diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs index 3d2e0632a33..014186c9ff4 100644 --- a/src/libsyntax/util/interner.rs +++ b/src/libsyntax/util/interner.rs @@ -21,7 +21,7 @@ pub struct Interner<T> { } // when traits can extend traits, we should extend index<uint,T> to get [] -impl<T:Eq + IterBytes + Hash + Freeze + Clone> Interner<T> { +impl<T:Eq + IterBytes + Hash + Freeze + Clone + 'static> Interner<T> { pub fn new() -> Interner<T> { Interner { map: @mut HashMap::new(), |