From beaf9117d40ae4aca94f80d65a13c7a484cd9086 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Tue, 1 Dec 2015 23:32:23 +0100
Subject: [PATCH] lifetime of tria.at

---
 src/trie.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/trie.rs b/src/trie.rs
index 597dbd085..88cc390e8 100644
--- a/src/trie.rs
+++ b/src/trie.rs
@@ -17,7 +17,7 @@ pub trait Trie {
 
 	// TODO: consider returning &[u8]...
 	fn contains(&self, key: &[u8]) -> bool;
-	fn at<'a>(&'a self, key: &'a [u8]) -> Option<&'a [u8]>;
+	fn at<'a, 'key>(&'a self, key: &'key [u8]) -> Option<&'a [u8]> where 'a: 'key;
 	fn insert(&mut self, key: &[u8], value: &[u8]);
 	fn remove(&mut self, key: &[u8]);
 }
@@ -214,12 +214,12 @@ impl TrieDB {
 		Ok(())
 	}
 
-	fn get<'a>(&'a self, key: &NibbleSlice<'a>) -> Option<&'a [u8]> {
+	fn get<'a, 'key>(&'a self, key: &NibbleSlice<'key>) -> Option<&'a [u8]> where 'a: 'key {
 		let root_rlp = self.db.lookup(&self.root).expect("Trie root not found!");
 		self.get_from_node(&root_rlp, key)
 	}
 
-	fn get_from_node<'a>(&'a self, node: &'a [u8], key: &NibbleSlice<'a>) -> Option<&'a [u8]> {
+	fn get_from_node<'a, 'key>(&'a self, node: &'a [u8], key: &NibbleSlice<'key>) -> Option<&'a [u8]> where 'a: 'key {
 		match Node::decoded(node) {
 			Node::Leaf(ref slice, ref value) if key == slice => Some(value),
 			Node::Extension(ref slice, ref item) if key.starts_with(slice) => {
@@ -469,7 +469,7 @@ impl Trie for TrieDB {
 		unimplemented!();
 	}
 
-	fn at<'a>(&'a self, key: &'a [u8]) -> Option<&'a [u8]> {
+	fn at<'a, 'key>(&'a self, key: &'key [u8]) -> Option<&'a [u8]> where 'a: 'key {
 		self.get(&NibbleSlice::new(key))
 	}
 
@@ -597,6 +597,9 @@ mod tests {
 			assert_eq!(t.at(&key).unwrap(), val);
 		}
 
+		// check lifetime
+		let _q = t.at(&[b'd', b'o']).unwrap();
+
 		assert_eq!(*t.root(), trie_root(v));
 	}