diff --git a/src/libcargo/cargo.rc b/src/libcargo/cargo.rc index e1dbab76aa9..5d55d2bc7a8 100644 --- a/src/libcargo/cargo.rc +++ b/src/libcargo/cargo.rc @@ -465,19 +465,19 @@ fn parse_source(name: ~str, j: &json::Json) -> @Source { match *j { json::Object(j) => { - let mut url = match j.find(&~"url") { + let mut url = match j.find_copy(&~"url") { Some(json::String(u)) => u, _ => fail ~"needed 'url' field in source" }; - let method = match j.find(&~"method") { + let method = match j.find_copy(&~"method") { Some(json::String(u)) => u, _ => assume_source_method(url) }; - let key = match j.find(&~"key") { + let key = match j.find_copy(&~"key") { Some(json::String(u)) => Some(u), _ => None }; - let keyfp = match j.find(&~"keyfp") { + let keyfp = match j.find_copy(&~"keyfp") { Some(json::String(u)) => Some(u), _ => None }; @@ -512,7 +512,7 @@ fn try_parse_sources(filename: &Path, sources: map::HashMap<~str, @Source>) { } fn load_one_source_package(src: @Source, p: &json::Object) { - let name = match p.find(&~"name") { + let name = match p.find_copy(&~"name") { Some(json::String(n)) => { if !valid_pkg_name(n) { warn(~"malformed source json: " @@ -529,7 +529,7 @@ fn load_one_source_package(src: @Source, p: &json::Object) { } }; - let uuid = match p.find(&~"uuid") { + let uuid = match p.find_copy(&~"uuid") { Some(json::String(n)) => { if !is_uuid(n) { warn(~"malformed source json: " @@ -545,7 +545,7 @@ fn load_one_source_package(src: @Source, p: &json::Object) { } }; - let url = match p.find(&~"url") { + let url = match p.find_copy(&~"url") { Some(json::String(n)) => n, _ => { warn(~"malformed source json: " + src.name + ~" (missing url)"); @@ -553,7 +553,7 @@ fn load_one_source_package(src: @Source, p: &json::Object) { } }; - let method = match p.find(&~"method") { + let method = match p.find_copy(&~"method") { Some(json::String(n)) => n, _ => { warn(~"malformed source json: " @@ -562,13 +562,13 @@ fn load_one_source_package(src: @Source, p: &json::Object) { } }; - let reference = match p.find(&~"ref") { + let reference = match p.find_copy(&~"ref") { Some(json::String(n)) => Some(n), _ => None }; let mut tags = ~[]; - match p.find(&~"tags") { + match p.find_copy(&~"tags") { Some(json::List(js)) => { for js.each |j| { match *j { @@ -580,7 +580,7 @@ fn load_one_source_package(src: @Source, p: &json::Object) { _ => () } - let description = match p.find(&~"description") { + let description = match p.find_copy(&~"description") { Some(json::String(n)) => n, _ => { warn(~"malformed source json: " + src.name diff --git a/src/libcore/hashmap.rs b/src/libcore/hashmap.rs index de891be0ee7..78306b500ff 100644 --- a/src/libcore/hashmap.rs +++ b/src/libcore/hashmap.rs @@ -398,7 +398,7 @@ pub mod linear { } impl LinearMap { - pure fn find(&const self, k: &K) -> Option { + pure fn find_copy(&const self, k: &K) -> Option { match self.bucket_for_key(self.buckets, k) { FoundEntry(idx) => { // FIXME (#3148): Once we rewrite found_entry, this @@ -414,8 +414,8 @@ pub mod linear { } } - pure fn get(&const self, k: &K) -> V { - let value = self.find(k); + pure fn get_copy(&const self, k: &K) -> V { + let value = self.find_copy(k); if value.is_none() { fail fmt!("No entry found for key: %?", k); } @@ -503,17 +503,17 @@ pub mod test { let mut m = ~LinearMap(); assert m.insert(1, 2); assert m.insert(2, 4); - assert m.get(&1) == 2; - assert m.get(&2) == 4; + assert m.get_copy(&1) == 2; + assert m.get_copy(&2) == 4; } #[test] pub fn overwrite() { let mut m = ~LinearMap(); assert m.insert(1, 2); - assert m.get(&1) == 2; + assert m.get_copy(&1) == 2; assert !m.insert(1, 3); - assert m.get(&1) == 3; + assert m.get_copy(&1) == 3; } #[test] @@ -522,9 +522,9 @@ pub mod test { assert m.insert(1, 2); assert m.insert(5, 3); assert m.insert(9, 4); - assert m.get(&9) == 4; - assert m.get(&5) == 3; - assert m.get(&1) == 2; + assert m.get_copy(&9) == 4; + assert m.get_copy(&5) == 3; + assert m.get_copy(&1) == 2; } #[test] @@ -534,8 +534,8 @@ pub mod test { assert m.insert(5, 3); assert m.insert(9, 4); assert m.remove(&1); - assert m.get(&9) == 4; - assert m.get(&5) == 3; + assert m.get_copy(&9) == 4; + assert m.get_copy(&5) == 3; } #[test] @@ -574,8 +574,8 @@ pub mod test { } assert m.len() == 0; assert m2.len() == 2; - assert m2.find(&1) == Some(2); - assert m2.find(&2) == Some(3); + assert m2.find_copy(&1) == Some(2); + assert m2.find_copy(&2) == Some(3); } #[test] diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs index 5d20fcf7f91..97ab5c139c1 100644 --- a/src/libstd/net_url.rs +++ b/src/libstd/net_url.rs @@ -11,9 +11,6 @@ //! Types/fns concerning URLs (see RFC 3986) #[forbid(deprecated_mode)]; -use map; -use map::HashMap; - use core::cmp::Eq; use core::dvec::DVec; use core::from_str::FromStr; @@ -21,7 +18,6 @@ use core::io::{Reader, ReaderUtil}; use core::io; use core::prelude::*; use core::hashmap::linear::LinearMap; -use core::hashmap; use core::str; use core::to_bytes::IterBytes; use core::to_bytes; @@ -244,9 +240,7 @@ pub fn encode_form_urlencoded(m: &LinearMap<~str, ~[~str]>) -> ~str { * Decode a string encoded with the 'application/x-www-form-urlencoded' media * type into a hashmap. */ -pub fn decode_form_urlencoded( - s: &[u8] -) -> hashmap::linear::LinearMap<~str, ~[~str]> { +pub fn decode_form_urlencoded(s: &[u8]) -> LinearMap<~str, ~[~str]> { do io::with_bytes_reader(s) |rdr| { let mut m = LinearMap(); let mut key = ~""; diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs index caf460a9be9..18b30f72ef0 100644 --- a/src/libstd/workcache.rs +++ b/src/libstd/workcache.rs @@ -173,7 +173,7 @@ impl Database { declared_inputs: &WorkMap) -> Option<(WorkMap, WorkMap, ~str)> { let k = json_encode(&(fn_name, declared_inputs)); - match self.db_cache.find(&k) { + match self.db_cache.find_copy(&k) { None => None, Some(v) => Some(json_decode(v)) } @@ -297,7 +297,7 @@ impl @Mut : TPrep { name: &str, val: &str) -> bool { do self.borrow_imm |p| { let k = kind.to_owned(); - let f = (p.ctxt.freshness.get(&k))(name, val); + let f = (*p.ctxt.freshness.get_ref(&k))(name, val); do p.ctxt.logger.borrow_imm |lg| { if f { lg.info(fmt!("%s %s:%s is fresh",