mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some FIXMEd code as the relevant issue is fixed

Browse Source
This commit is contained in:
Niko Matsakis 2012-08-21 08:10:32 -07:00
parent 9440f8e9b8
commit 182814ef81
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/libcore/send_map.rs
View File

@ -58,12 +58,6 @@ fn linear_map_with_capacity<K,V>(
buckets: vec::from_fn(initial_capacity, |_i| none)})
}
// FIXME(#2979) would allow us to use region type for k
unsafe fn borrow<K>(&&k: K) -> &K {
let p: *K = ptr::addr_of(k);
unsafe::reinterpret_cast(p)
}
priv impl<K, V> &const LinearMap<K,V> {
#[inline(always)]
pure fn to_bucket(h: uint) -> uint {
@ -155,8 +149,7 @@ fn insert_bucket(+bucket: option<Bucket<K,V>>) {
/// Assumes that there will be a bucket.
/// True if there was no previous entry with that key
fn insert_internal(hash: uint, +k: K, +v: V) -> bool {
match self.bucket_for_key_with_hash(self.buckets, hash,
unsafe{borrow(k)}) {
match self.bucket_for_key_with_hash(self.buckets, hash, &k) {
TableFull => {fail ~"Internal logic error";}
FoundHole(idx) => {
debug!{"insert fresh (%?->%?) at idx %?, hash %?",
@ -187,7 +180,7 @@ fn insert(+k: K, +v: V) -> bool {
self.expand();
}
let hash = self.hashfn(unsafe{borrow(k)});
let hash = self.hashfn(&k);
self.insert_internal(hash, k, v)
}
@ -279,11 +272,19 @@ fn get(k: &K) -> V {
impl<K,V> &LinearMap<K,V> {
/*
FIXME --- #2979 must be fixed to typecheck this
fn find_ptr(k: K) -> option<&V> {
//XXX this should not type check as written, but it should
//be *possible* to typecheck it...
self.with_ptr(k, |v| v)
FIXME(#3148)--region inference fails to capture needed deps
fn find_ref(k: &K) -> option<&self/V> {
match self.bucket_for_key(self.buckets, k) {
FoundEntry(idx) => {
match check self.buckets[idx] {
some(ref bkt) => some(&bkt.value)
}
}
TableFull | FoundHole(_) => {
none
}
}
}
*/