Skip to content

Commit b7ef28c

Browse files
committed
rename send_map to hashmap
This makes the module much more discoverable, and is in line with the 'treemap' naming.
1 parent 54344c2 commit b7ef28c

File tree

13 files changed

+20
-20
lines changed

13 files changed

+20
-20
lines changed

src/libcargo/cargo.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ use core::*;
5252
use core::dvec::DVec;
5353
use core::io::WriterUtil;
5454
use core::result::{Ok, Err};
55-
use core::send_map::linear::LinearMap;
55+
use core::hashmap::linear::LinearMap;
5656
use std::getopts::{optflag, optopt, opt_present};
5757
use std::map::HashMap;
5858
use std::{map, json, tempfile, term, sort, getopts};

src/libcore/core.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ pub mod dvec_iter;
138138
pub mod dlist;
139139
#[path="iter-trait.rs"] #[merge = "iter-trait/dlist.rs"]
140140
pub mod dlist_iter;
141-
pub mod send_map;
141+
pub mod hashmap;
142142

143143

144144
/* Tasks and communication */

src/libcore/gc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ use io;
4444
use libc::{size_t, uintptr_t};
4545
use option::{None, Option, Some};
4646
use ptr;
47-
use send_map::linear::LinearSet;
47+
use hashmap::linear::LinearSet;
4848
use stackwalk;
4949
use sys;
5050

src/libcore/send_map.rs renamed to src/libcore/hashmap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ pub mod linear {
494494
#[test]
495495
pub mod test {
496496
use option::{None, Some};
497-
use send_map::linear::LinearMap;
498-
use send_map::linear;
497+
use hashmap::linear::LinearMap;
498+
use hashmap::linear;
499499
use uint;
500500

501501
#[test]

src/libcore/task/spawn.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ use pipes;
8181
use prelude::*;
8282
use private;
8383
use ptr;
84-
use send_map;
84+
use hashmap::linear::LinearSet;
8585
use task::local_data_priv::{local_get, local_set};
8686
use task::rt::rust_task;
8787
use task::rt::rust_closure;
@@ -96,10 +96,10 @@ macro_rules! move_it (
9696
{ $x:expr } => ( unsafe { let y = move *ptr::addr_of(&($x)); move y } )
9797
)
9898

99-
type TaskSet = send_map::linear::LinearSet<*rust_task>;
99+
type TaskSet = LinearSet<*rust_task>;
100100

101101
fn new_taskset() -> TaskSet {
102-
send_map::linear::LinearSet::new()
102+
LinearSet::new()
103103
}
104104
fn taskset_insert(tasks: &mut TaskSet, task: *rust_task) {
105105
let didnt_overwrite = tasks.insert(task);

src/librustc/middle/borrowck/gather_loans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use util::common::indenter;
3030
use util::ppaux::{expr_repr, region_to_str};
3131

3232
use core::dvec;
33-
use core::send_map::linear::LinearSet;
33+
use core::hashmap::linear::LinearSet;
3434
use core::vec;
3535
use std::map::HashMap;
3636
use syntax::ast::{m_const, m_imm, m_mutbl};

src/librustc/middle/typeck/coherence.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ use util::ppaux::ty_to_str;
5757

5858
use core::dvec::DVec;
5959
use core::result::Ok;
60-
use core::send_map;
60+
use core::hashmap::linear::LinearSet;
6161
use core::uint::range;
6262
use core::uint;
6363
use core::vec::{len, push};
@@ -693,7 +693,7 @@ impl CoherenceChecker {
693693
694694
let tcx = self.crate_context.tcx;
695695
696-
let mut provided_names = send_map::linear::LinearSet::new();
696+
let mut provided_names = LinearSet::new();
697697
// Implemented methods
698698
for uint::range(0, all_methods.len()) |i| {
699699
provided_names.insert(all_methods[i].ident);

src/libstd/json.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use core::float;
2424
use core::io::{WriterUtil, ReaderUtil};
2525
use core::io;
2626
use core::prelude::*;
27-
use core::send_map::linear;
27+
use core::hashmap::linear;
2828
use core::str;
2929
use core::to_str;
3030
use core::vec;
@@ -1223,7 +1223,7 @@ mod tests {
12231223
use json::*;
12241224

12251225
use core::result;
1226-
use core::send_map::linear;
1226+
use core::hashmap::linear;
12271227

12281228
fn mk_object(items: &[(~str, Json)]) -> Json {
12291229
let mut d = ~linear::LinearMap();

src/libstd/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use core::ops;
1919
use core::to_str::ToStr;
2020
use core::mutable::Mut;
2121
use core::prelude::*;
22-
use core::send_map::linear::LinearMap;
22+
use core::hashmap::linear::LinearMap;
2323
use core::to_bytes::IterBytes;
2424
use core::uint;
2525
use core::vec;

src/libstd/net_url.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use core::from_str::FromStr;
2020
use core::io::{Reader, ReaderUtil};
2121
use core::io;
2222
use core::prelude::*;
23-
use core::send_map::linear::LinearMap;
24-
use core::send_map;
23+
use core::hashmap::linear::LinearMap;
24+
use core::hashmap;
2525
use core::str;
2626
use core::to_bytes::IterBytes;
2727
use core::to_bytes;
@@ -246,7 +246,7 @@ pub fn encode_form_urlencoded(m: &LinearMap<~str, ~[~str]>) -> ~str {
246246
*/
247247
pub fn decode_form_urlencoded(
248248
s: &[u8]
249-
) -> send_map::linear::LinearMap<~str, ~[~str]> {
249+
) -> hashmap::linear::LinearMap<~str, ~[~str]> {
250250
do io::with_bytes_reader(s) |rdr| {
251251
let mut m = LinearMap();
252252
let mut key = ~"";

src/libstd/workcache.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use core::pipes::{recv, oneshot, PortOne, send_one};
2222
use core::prelude::*;
2323
use core::result;
2424
use core::run;
25-
use core::send_map::linear::LinearMap;
25+
use core::hashmap::linear::LinearMap;
2626
use core::task;
2727
use core::to_bytes;
2828
use core::mutable::Mut;

src/test/bench/core-map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
extern mod std;
1818
use std::map;
1919
use core::mutable::Mut;
20-
use core::send_map::linear::*;
20+
use core::hashmap::linear::*;
2121
use core::io::WriterUtil;
2222

2323
struct Results {

src/test/run-pass/issue-4016.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// xfail-test
1212
extern mod std;
1313

14-
use send_map::linear;
14+
use hashmap::linear;
1515
use std::json;
1616
use std::serialization::{Deserializable, deserialize};
1717

0 commit comments

Comments
 (0)