Add ManagedMap::range. #12
Conversation
|
Hmm, I'm having an issue with Rust versions. I have to do Any idea on how to solve this? |
progval
force-pushed
the
managedmap-range
branch
3 times, most recently
from
56be1ed to
4ca776e
Compare
|
Got it! |
src/map.rs
Outdated
| @@ -90,6 +96,103 @@ impl<T> Into<Option<T>> for RevOption<T> { | |||
| } | |||
| } | |||
|
|
|||
| pub enum Range<'a, 'b, K: 'a, V: 'a> where 'a: 'b { | |||
There was a problem hiding this comment.
Hmm, is there a reason the lifetimes have to be like this? Why not K: 'b, V: 'b?
src/map.rs
Outdated
| /// Owned variant, only available with the `std` or `alloc` feature enabled. | ||
| #[cfg(any(feature = "std", feature = "alloc"))] | ||
| Owned(BTreeRange<'b, K, V>), | ||
| _Phantom(&'a K), |
There was a problem hiding this comment.
This should, at least, be #[doc(hidden)], and I usually go with __Phantom (two underscores).
src/map.rs
Outdated
| break; | ||
| } | ||
| } | ||
| assert_eq!(left, right); |
There was a problem hiding this comment.
When will this assertion fail?
src/map.rs
Outdated
| break; | ||
| } | ||
| } | ||
| assert_eq!(left, right); |
There was a problem hiding this comment.
When will this assertion fail?
src/map.rs
Outdated
| let middle = left + (right-left)/2; | ||
| if key!(slice[middle]) < Some(key_begin) { | ||
| left = middle+1; | ||
| } |
There was a problem hiding this comment.
Nit: } else here and elsewhere.
src/map.rs
Outdated
| @@ -155,6 +258,23 @@ impl<'a, K: Ord + 'a, V: 'a> ManagedMap<'a, K, V> { | |||
| } | |||
| } | |||
|
|
|||
| pub fn range<'b, 'c, Q>(&'c self, key_begin: &Q, key_end: &Q) -> Range<'a, 'b, K, V> | |||
| where K: Borrow<Q>, Q: Ord + ?Sized, 'a: 'b, 'c: 'a | |||
There was a problem hiding this comment.
Is 'c really necessary here?
There was a problem hiding this comment.
Yes, the ManagedMap has to outlive the Range's references.
src/map.rs
Outdated
| break; | ||
| } | ||
| } | ||
| assert_eq!(left, right); |
There was a problem hiding this comment.
No, this really was a question. Will this assertion fail if the entries are out of order or something like that? Then it should stay. See the other assertions in this file that panic with "invariant violated".
There was a problem hiding this comment.
No, it can't fail. I used it while debugging
|
Thanks. What do you think about removing rustc version detection entirely? I was thinking about using impl Trait in smoltcp and that would imply 1.26. I don't think we care very much about 1.25 or earlier. |
|
Okay. I currently have only rust 1.25 on my computer, but I can fix that. |
progval
force-pushed
the
managedmap-range
branch
2 times, most recently
from
5b7dfe7 to
7849e64
Compare
|
I wonder if I should add "shortcuts", to skip a dichotomy if smoltcp-rs/smoltcp#209 would be one use case, because we'll use |
|
I just improved my implementation to have an interface similar to It uses the nightly feature "collections_range", but it is going to be stabilized soon; and |
|
Thanks. |
As mentioned here: smoltcp-rs/smoltcp#209 (comment)