bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rename hashmap find/get -> find_copy/get_copy

Browse source
This commit is contained in:
Daniel Micay 2013-01-23 11:08:33 -05:00
parent bc96fe9c49
commit 203fcbd0f3
4 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libcargo/cargo.rc
View file

@ -465,19 +465,19 @@ fn parse_source(name: ~str, j: &json::Json) -> @Source {
match *j { match *j {
json::Object(j) => { json::Object(j) => {
let mut url = match j.find(&~"url") { let mut url = match j.find_copy(&~"url") {
Some(json::String(u)) => u, Some(json::String(u)) => u,
_ => fail ~"needed 'url' field in source" _ => fail ~"needed 'url' field in source"
}; };
let method = match j.find(&~"method") { let method = match j.find_copy(&~"method") {
Some(json::String(u)) => u, Some(json::String(u)) => u,
_ => assume_source_method(url) _ => assume_source_method(url)
}; };
let key = match j.find(&~"key") { let key = match j.find_copy(&~"key") {
Some(json::String(u)) => Some(u), Some(json::String(u)) => Some(u),
_ => None _ => None
}; };
let keyfp = match j.find(&~"keyfp") { let keyfp = match j.find_copy(&~"keyfp") {
Some(json::String(u)) => Some(u), Some(json::String(u)) => Some(u),
_ => None _ => 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) { 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)) => { Some(json::String(n)) => {
if !valid_pkg_name(n) { if !valid_pkg_name(n) {
warn(~"malformed source json: " 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)) => { Some(json::String(n)) => {
if !is_uuid(n) { if !is_uuid(n) {
warn(~"malformed source json: " 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, Some(json::String(n)) => n,
_ => { _ => {
warn(~"malformed source json: " + src.name + ~" (missing url)"); 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, Some(json::String(n)) => n,
_ => { _ => {
warn(~"malformed source json: " 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), Some(json::String(n)) => Some(n),
_ => None _ => None
}; };
let mut tags = ~[]; let mut tags = ~[];
match p.find(&~"tags") { match p.find_copy(&~"tags") {
Some(json::List(js)) => { Some(json::List(js)) => {
for js.each |j| { for js.each |j| {
match *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, Some(json::String(n)) => n,
_ => { _ => {
warn(~"malformed source json: " + src.name warn(~"malformed source json: " + src.name

28
src/libcore/hashmap.rs
View file

@ -398,7 +398,7 @@ pub mod linear {
} }
impl<K:Hash IterBytes Eq, V: Copy> LinearMap<K,V> { impl<K:Hash IterBytes Eq, V: Copy> LinearMap<K,V> {
pure fn find(&const self, k: &K) -> Option<V> { pure fn find_copy(&const self, k: &K) -> Option<V> {
match self.bucket_for_key(self.buckets, k) { match self.bucket_for_key(self.buckets, k) {
FoundEntry(idx) => { FoundEntry(idx) => {
// FIXME (#3148): Once we rewrite found_entry, this // FIXME (#3148): Once we rewrite found_entry, this
@ -414,8 +414,8 @@ pub mod linear {
} }
} }
pure fn get(&const self, k: &K) -> V { pure fn get_copy(&const self, k: &K) -> V {
let value = self.find(k); let value = self.find_copy(k);
if value.is_none() { if value.is_none() {
fail fmt!("No entry found for key: %?", k); fail fmt!("No entry found for key: %?", k);
} }
@ -503,17 +503,17 @@ pub mod test {
let mut m = ~LinearMap(); let mut m = ~LinearMap();
assert m.insert(1, 2); assert m.insert(1, 2);
assert m.insert(2, 4); assert m.insert(2, 4);
assert m.get(&1) == 2; assert m.get_copy(&1) == 2;
assert m.get(&2) == 4; assert m.get_copy(&2) == 4;
} }
#[test] #[test]
pub fn overwrite() { pub fn overwrite() {
let mut m = ~LinearMap(); let mut m = ~LinearMap();
assert m.insert(1, 2); assert m.insert(1, 2);
assert m.get(&1) == 2; assert m.get_copy(&1) == 2;
assert !m.insert(1, 3); assert !m.insert(1, 3);
assert m.get(&1) == 3; assert m.get_copy(&1) == 3;
} }
#[test] #[test]
@ -522,9 +522,9 @@ pub mod test {
assert m.insert(1, 2); assert m.insert(1, 2);
assert m.insert(5, 3); assert m.insert(5, 3);
assert m.insert(9, 4); assert m.insert(9, 4);
assert m.get(&9) == 4; assert m.get_copy(&9) == 4;
assert m.get(&5) == 3; assert m.get_copy(&5) == 3;
assert m.get(&1) == 2; assert m.get_copy(&1) == 2;
} }
#[test] #[test]
@ -534,8 +534,8 @@ pub mod test {
assert m.insert(5, 3); assert m.insert(5, 3);
assert m.insert(9, 4); assert m.insert(9, 4);
assert m.remove(&1); assert m.remove(&1);
assert m.get(&9) == 4; assert m.get_copy(&9) == 4;
assert m.get(&5) == 3; assert m.get_copy(&5) == 3;
} }
#[test] #[test]
@ -574,8 +574,8 @@ pub mod test {
} }
assert m.len() == 0; assert m.len() == 0;
assert m2.len() == 2; assert m2.len() == 2;
assert m2.find(&1) == Some(2); assert m2.find_copy(&1) == Some(2);
assert m2.find(&2) == Some(3); assert m2.find_copy(&2) == Some(3);
} }
#[test] #[test]

8
src/libstd/net_url.rs
View file

@ -11,9 +11,6 @@
//! Types/fns concerning URLs (see RFC 3986) //! Types/fns concerning URLs (see RFC 3986)
#[forbid(deprecated_mode)]; #[forbid(deprecated_mode)];
use map;
use map::HashMap;
use core::cmp::Eq; use core::cmp::Eq;
use core::dvec::DVec; use core::dvec::DVec;
use core::from_str::FromStr; use core::from_str::FromStr;
@ -21,7 +18,6 @@ use core::io::{Reader, ReaderUtil};
use core::io; use core::io;
use core::prelude::*; use core::prelude::*;
use core::hashmap::linear::LinearMap; use core::hashmap::linear::LinearMap;
use core::hashmap;
use core::str; use core::str;
use core::to_bytes::IterBytes; use core::to_bytes::IterBytes;
use core::to_bytes; 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 * Decode a string encoded with the 'application/x-www-form-urlencoded' media
* type into a hashmap. * type into a hashmap.
*/ */
pub fn decode_form_urlencoded( pub fn decode_form_urlencoded(s: &[u8]) -> LinearMap<~str, ~[~str]> {
s: &[u8]
) -> hashmap::linear::LinearMap<~str, ~[~str]> {
do io::with_bytes_reader(s) |rdr| { do io::with_bytes_reader(s) |rdr| {
let mut m = LinearMap(); let mut m = LinearMap();
let mut key = ~""; let mut key = ~"";

4
src/libstd/workcache.rs
View file

@ -173,7 +173,7 @@ impl Database {
declared_inputs: &WorkMap) -> declared_inputs: &WorkMap) ->
Option<(WorkMap, WorkMap, ~str)> { Option<(WorkMap, WorkMap, ~str)> {
let k = json_encode(&(fn_name, declared_inputs)); let k = json_encode(&(fn_name, declared_inputs));
match self.db_cache.find(&k) { match self.db_cache.find_copy(&k) {
None => None, None => None,
Some(v) => Some(json_decode(v)) Some(v) => Some(json_decode(v))
} }
@ -297,7 +297,7 @@ impl @Mut<Prep> : TPrep {
name: &str, val: &str) -> bool { name: &str, val: &str) -> bool {
do self.borrow_imm |p| { do self.borrow_imm |p| {
let k = kind.to_owned(); 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| { do p.ctxt.logger.borrow_imm |lg| {
if f { if f {
lg.info(fmt!("%s %s:%s is fresh", lg.info(fmt!("%s %s:%s is fresh",