rename send_map to hashmap
This makes the module much more discoverable, and is in line with the 'treemap' naming.
This commit is contained in:
parent
54344c2468
commit
b7ef28c33a
|
@ -52,7 +52,7 @@ use core::*;
|
|||
use core::dvec::DVec;
|
||||
use core::io::WriterUtil;
|
||||
use core::result::{Ok, Err};
|
||||
use core::send_map::linear::LinearMap;
|
||||
use core::hashmap::linear::LinearMap;
|
||||
use std::getopts::{optflag, optopt, opt_present};
|
||||
use std::map::HashMap;
|
||||
use std::{map, json, tempfile, term, sort, getopts};
|
||||
|
|
|
@ -138,7 +138,7 @@ pub mod dvec_iter;
|
|||
pub mod dlist;
|
||||
#[path="iter-trait.rs"] #[merge = "iter-trait/dlist.rs"]
|
||||
pub mod dlist_iter;
|
||||
pub mod send_map;
|
||||
pub mod hashmap;
|
||||
|
||||
|
||||
/* Tasks and communication */
|
||||
|
|
|
@ -44,7 +44,7 @@ use io;
|
|||
use libc::{size_t, uintptr_t};
|
||||
use option::{None, Option, Some};
|
||||
use ptr;
|
||||
use send_map::linear::LinearSet;
|
||||
use hashmap::linear::LinearSet;
|
||||
use stackwalk;
|
||||
use sys;
|
||||
|
||||
|
|
|
@ -494,8 +494,8 @@ pub mod linear {
|
|||
#[test]
|
||||
pub mod test {
|
||||
use option::{None, Some};
|
||||
use send_map::linear::LinearMap;
|
||||
use send_map::linear;
|
||||
use hashmap::linear::LinearMap;
|
||||
use hashmap::linear;
|
||||
use uint;
|
||||
|
||||
#[test]
|
|
@ -81,7 +81,7 @@ use pipes;
|
|||
use prelude::*;
|
||||
use private;
|
||||
use ptr;
|
||||
use send_map;
|
||||
use hashmap::linear::LinearSet;
|
||||
use task::local_data_priv::{local_get, local_set};
|
||||
use task::rt::rust_task;
|
||||
use task::rt::rust_closure;
|
||||
|
@ -96,10 +96,10 @@ macro_rules! move_it (
|
|||
{ $x:expr } => ( unsafe { let y = move *ptr::addr_of(&($x)); move y } )
|
||||
)
|
||||
|
||||
type TaskSet = send_map::linear::LinearSet<*rust_task>;
|
||||
type TaskSet = LinearSet<*rust_task>;
|
||||
|
||||
fn new_taskset() -> TaskSet {
|
||||
send_map::linear::LinearSet::new()
|
||||
LinearSet::new()
|
||||
}
|
||||
fn taskset_insert(tasks: &mut TaskSet, task: *rust_task) {
|
||||
let didnt_overwrite = tasks.insert(task);
|
||||
|
|
|
@ -30,7 +30,7 @@ use util::common::indenter;
|
|||
use util::ppaux::{expr_repr, region_to_str};
|
||||
|
||||
use core::dvec;
|
||||
use core::send_map::linear::LinearSet;
|
||||
use core::hashmap::linear::LinearSet;
|
||||
use core::vec;
|
||||
use std::map::HashMap;
|
||||
use syntax::ast::{m_const, m_imm, m_mutbl};
|
||||
|
|
|
@ -57,7 +57,7 @@ use util::ppaux::ty_to_str;
|
|||
|
||||
use core::dvec::DVec;
|
||||
use core::result::Ok;
|
||||
use core::send_map;
|
||||
use core::hashmap::linear::LinearSet;
|
||||
use core::uint::range;
|
||||
use core::uint;
|
||||
use core::vec::{len, push};
|
||||
|
@ -693,7 +693,7 @@ impl CoherenceChecker {
|
|||
|
||||
let tcx = self.crate_context.tcx;
|
||||
|
||||
let mut provided_names = send_map::linear::LinearSet::new();
|
||||
let mut provided_names = LinearSet::new();
|
||||
// Implemented methods
|
||||
for uint::range(0, all_methods.len()) |i| {
|
||||
provided_names.insert(all_methods[i].ident);
|
||||
|
|
|
@ -24,7 +24,7 @@ use core::float;
|
|||
use core::io::{WriterUtil, ReaderUtil};
|
||||
use core::io;
|
||||
use core::prelude::*;
|
||||
use core::send_map::linear;
|
||||
use core::hashmap::linear;
|
||||
use core::str;
|
||||
use core::to_str;
|
||||
use core::vec;
|
||||
|
@ -1223,7 +1223,7 @@ mod tests {
|
|||
use json::*;
|
||||
|
||||
use core::result;
|
||||
use core::send_map::linear;
|
||||
use core::hashmap::linear;
|
||||
|
||||
fn mk_object(items: &[(~str, Json)]) -> Json {
|
||||
let mut d = ~linear::LinearMap();
|
||||
|
|
|
@ -19,7 +19,7 @@ use core::ops;
|
|||
use core::to_str::ToStr;
|
||||
use core::mutable::Mut;
|
||||
use core::prelude::*;
|
||||
use core::send_map::linear::LinearMap;
|
||||
use core::hashmap::linear::LinearMap;
|
||||
use core::to_bytes::IterBytes;
|
||||
use core::uint;
|
||||
use core::vec;
|
||||
|
|
|
@ -20,8 +20,8 @@ use core::from_str::FromStr;
|
|||
use core::io::{Reader, ReaderUtil};
|
||||
use core::io;
|
||||
use core::prelude::*;
|
||||
use core::send_map::linear::LinearMap;
|
||||
use core::send_map;
|
||||
use core::hashmap::linear::LinearMap;
|
||||
use core::hashmap;
|
||||
use core::str;
|
||||
use core::to_bytes::IterBytes;
|
||||
use core::to_bytes;
|
||||
|
@ -246,7 +246,7 @@ pub fn encode_form_urlencoded(m: &LinearMap<~str, ~[~str]>) -> ~str {
|
|||
*/
|
||||
pub fn decode_form_urlencoded(
|
||||
s: &[u8]
|
||||
) -> send_map::linear::LinearMap<~str, ~[~str]> {
|
||||
) -> hashmap::linear::LinearMap<~str, ~[~str]> {
|
||||
do io::with_bytes_reader(s) |rdr| {
|
||||
let mut m = LinearMap();
|
||||
let mut key = ~"";
|
||||
|
|
|
@ -22,7 +22,7 @@ use core::pipes::{recv, oneshot, PortOne, send_one};
|
|||
use core::prelude::*;
|
||||
use core::result;
|
||||
use core::run;
|
||||
use core::send_map::linear::LinearMap;
|
||||
use core::hashmap::linear::LinearMap;
|
||||
use core::task;
|
||||
use core::to_bytes;
|
||||
use core::mutable::Mut;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
extern mod std;
|
||||
use std::map;
|
||||
use core::mutable::Mut;
|
||||
use core::send_map::linear::*;
|
||||
use core::hashmap::linear::*;
|
||||
use core::io::WriterUtil;
|
||||
|
||||
struct Results {
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
// xfail-test
|
||||
extern mod std;
|
||||
|
||||
use send_map::linear;
|
||||
use hashmap::linear;
|
||||
use std::json;
|
||||
use std::serialization::{Deserializable, deserialize};
|
||||
|
||||
|
|
Loading…
Reference in New Issue