Skip to content

Commit e754d2b

Browse files
thestingerthestinger
committed
---
yaml --- r: 52460 b: refs/heads/dist-snap c: 203fcbd h: refs/heads/master v: v3
1 parent da5d1ae commit e754d2b

File tree

5 files changed

+29
-35
lines changed

5 files changed

+29
-35
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: bc96fe9c4995bcf28e084e3a84293ebbf47f84d4
10+
refs/heads/dist-snap: 203fcbd0f360fdae9db551bf63e14fe152150cc9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/src/libcargo/cargo.rc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -465,19 +465,19 @@ fn parse_source(name: ~str, j: &json::Json) -> @Source {
465465

466466
match *j {
467467
json::Object(j) => {
468-
let mut url = match j.find(&~"url") {
468+
let mut url = match j.find_copy(&~"url") {
469469
Some(json::String(u)) => u,
470470
_ => fail ~"needed 'url' field in source"
471471
};
472-
let method = match j.find(&~"method") {
472+
let method = match j.find_copy(&~"method") {
473473
Some(json::String(u)) => u,
474474
_ => assume_source_method(url)
475475
};
476-
let key = match j.find(&~"key") {
476+
let key = match j.find_copy(&~"key") {
477477
Some(json::String(u)) => Some(u),
478478
_ => None
479479
};
480-
let keyfp = match j.find(&~"keyfp") {
480+
let keyfp = match j.find_copy(&~"keyfp") {
481481
Some(json::String(u)) => Some(u),
482482
_ => None
483483
};
@@ -512,7 +512,7 @@ fn try_parse_sources(filename: &Path, sources: map::HashMap<~str, @Source>) {
512512
}
513513

514514
fn load_one_source_package(src: @Source, p: &json::Object) {
515-
let name = match p.find(&~"name") {
515+
let name = match p.find_copy(&~"name") {
516516
Some(json::String(n)) => {
517517
if !valid_pkg_name(n) {
518518
warn(~"malformed source json: "
@@ -529,7 +529,7 @@ fn load_one_source_package(src: @Source, p: &json::Object) {
529529
}
530530
};
531531

532-
let uuid = match p.find(&~"uuid") {
532+
let uuid = match p.find_copy(&~"uuid") {
533533
Some(json::String(n)) => {
534534
if !is_uuid(n) {
535535
warn(~"malformed source json: "
@@ -545,15 +545,15 @@ fn load_one_source_package(src: @Source, p: &json::Object) {
545545
}
546546
};
547547

548-
let url = match p.find(&~"url") {
548+
let url = match p.find_copy(&~"url") {
549549
Some(json::String(n)) => n,
550550
_ => {
551551
warn(~"malformed source json: " + src.name + ~" (missing url)");
552552
return;
553553
}
554554
};
555555

556-
let method = match p.find(&~"method") {
556+
let method = match p.find_copy(&~"method") {
557557
Some(json::String(n)) => n,
558558
_ => {
559559
warn(~"malformed source json: "
@@ -562,13 +562,13 @@ fn load_one_source_package(src: @Source, p: &json::Object) {
562562
}
563563
};
564564

565-
let reference = match p.find(&~"ref") {
565+
let reference = match p.find_copy(&~"ref") {
566566
Some(json::String(n)) => Some(n),
567567
_ => None
568568
};
569569

570570
let mut tags = ~[];
571-
match p.find(&~"tags") {
571+
match p.find_copy(&~"tags") {
572572
Some(json::List(js)) => {
573573
for js.each |j| {
574574
match *j {
@@ -580,7 +580,7 @@ fn load_one_source_package(src: @Source, p: &json::Object) {
580580
_ => ()
581581
}
582582

583-
let description = match p.find(&~"description") {
583+
let description = match p.find_copy(&~"description") {
584584
Some(json::String(n)) => n,
585585
_ => {
586586
warn(~"malformed source json: " + src.name

‎branches/dist-snap/src/libcore/hashmap.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ pub mod linear {
398398
}
399399

400400
impl<K:Hash IterBytes Eq, V: Copy> LinearMap<K,V> {
401-
pure fn find(&const self, k: &K) -> Option<V> {
401+
pure fn find_copy(&const self, k: &K) -> Option<V> {
402402
match self.bucket_for_key(self.buckets, k) {
403403
FoundEntry(idx) => {
404404
// FIXME (#3148): Once we rewrite found_entry, this
@@ -414,8 +414,8 @@ pub mod linear {
414414
}
415415
}
416416

417-
pure fn get(&const self, k: &K) -> V {
418-
let value = self.find(k);
417+
pure fn get_copy(&const self, k: &K) -> V {
418+
let value = self.find_copy(k);
419419
if value.is_none() {
420420
fail fmt!("No entry found for key: %?", k);
421421
}
@@ -503,17 +503,17 @@ pub mod test {
503503
let mut m = ~LinearMap();
504504
assert m.insert(1, 2);
505505
assert m.insert(2, 4);
506-
assert m.get(&1) == 2;
507-
assert m.get(&2) == 4;
506+
assert m.get_copy(&1) == 2;
507+
assert m.get_copy(&2) == 4;
508508
}
509509

510510
#[test]
511511
pub fn overwrite() {
512512
let mut m = ~LinearMap();
513513
assert m.insert(1, 2);
514-
assert m.get(&1) == 2;
514+
assert m.get_copy(&1) == 2;
515515
assert !m.insert(1, 3);
516-
assert m.get(&1) == 3;
516+
assert m.get_copy(&1) == 3;
517517
}
518518

519519
#[test]
@@ -522,9 +522,9 @@ pub mod test {
522522
assert m.insert(1, 2);
523523
assert m.insert(5, 3);
524524
assert m.insert(9, 4);
525-
assert m.get(&9) == 4;
526-
assert m.get(&5) == 3;
527-
assert m.get(&1) == 2;
525+
assert m.get_copy(&9) == 4;
526+
assert m.get_copy(&5) == 3;
527+
assert m.get_copy(&1) == 2;
528528
}
529529

530530
#[test]
@@ -534,8 +534,8 @@ pub mod test {
534534
assert m.insert(5, 3);
535535
assert m.insert(9, 4);
536536
assert m.remove(&1);
537-
assert m.get(&9) == 4;
538-
assert m.get(&5) == 3;
537+
assert m.get_copy(&9) == 4;
538+
assert m.get_copy(&5) == 3;
539539
}
540540

541541
#[test]
@@ -574,8 +574,8 @@ pub mod test {
574574
}
575575
assert m.len() == 0;
576576
assert m2.len() == 2;
577-
assert m2.find(&1) == Some(2);
578-
assert m2.find(&2) == Some(3);
577+
assert m2.find_copy(&1) == Some(2);
578+
assert m2.find_copy(&2) == Some(3);
579579
}
580580

581581
#[test]

‎branches/dist-snap/src/libstd/net_url.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@
1111
//! Types/fns concerning URLs (see RFC 3986)
1212
#[forbid(deprecated_mode)];
1313

14-
use map;
15-
use map::HashMap;
16-
1714
use core::cmp::Eq;
1815
use core::dvec::DVec;
1916
use core::from_str::FromStr;
2017
use core::io::{Reader, ReaderUtil};
2118
use core::io;
2219
use core::prelude::*;
2320
use core::hashmap::linear::LinearMap;
24-
use core::hashmap;
2521
use core::str;
2622
use core::to_bytes::IterBytes;
2723
use core::to_bytes;
@@ -244,9 +240,7 @@ pub fn encode_form_urlencoded(m: &LinearMap<~str, ~[~str]>) -> ~str {
244240
* Decode a string encoded with the 'application/x-www-form-urlencoded' media
245241
* type into a hashmap.
246242
*/
247-
pub fn decode_form_urlencoded(
248-
s: &[u8]
249-
) -> hashmap::linear::LinearMap<~str, ~[~str]> {
243+
pub fn decode_form_urlencoded(s: &[u8]) -> LinearMap<~str, ~[~str]> {
250244
do io::with_bytes_reader(s) |rdr| {
251245
let mut m = LinearMap();
252246
let mut key = ~"";

‎branches/dist-snap/src/libstd/workcache.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl Database {
173173
declared_inputs: &WorkMap) ->
174174
Option<(WorkMap, WorkMap, ~str)> {
175175
let k = json_encode(&(fn_name, declared_inputs));
176-
match self.db_cache.find(&k) {
176+
match self.db_cache.find_copy(&k) {
177177
None => None,
178178
Some(v) => Some(json_decode(v))
179179
}
@@ -297,7 +297,7 @@ impl @Mut<Prep> : TPrep {
297297
name: &str, val: &str) -> bool {
298298
do self.borrow_imm |p| {
299299
let k = kind.to_owned();
300-
let f = (p.ctxt.freshness.get(&k))(name, val);
300+
let f = (*p.ctxt.freshness.get_ref(&k))(name, val);
301301
do p.ctxt.logger.borrow_imm |lg| {
302302
if f {
303303
lg.info(fmt!("%s %s:%s is fresh",

0 commit comments

Comments
 (0)