From cc148b58ff7a4eb6861701be61396d1a685f6657 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 3 Apr 2013 09:28:36 -0400 Subject: rename Linear{Map,Set} => Hash{Map,Set} --- src/librustpkg/rustpkg.rc | 10 +++++----- src/librustpkg/util.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/librustpkg') diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc index 2f1d25425ec..bf1301868af 100644 --- a/src/librustpkg/rustpkg.rc +++ b/src/librustpkg/rustpkg.rc @@ -28,7 +28,7 @@ extern mod syntax(vers = "0.6"); use core::*; use core::container::Map; -use core::hashmap::LinearMap; +use core::hashmap::HashMap; use core::io::WriterUtil; use rustc::driver::{driver, session}; use rustc::metadata::filesearch; @@ -253,7 +253,7 @@ impl PackageScript { struct Ctx { cfgs: ~[~str], json: bool, - dep_cache: @mut LinearMap<~str, bool> + dep_cache: @mut HashMap<~str, bool> } impl Ctx { @@ -483,14 +483,14 @@ impl Ctx { if self.json { match PackageScript::parse(&os::getcwd()) { result::Ok(script) => { - let mut map = ~LinearMap::new(); + let mut map = ~HashMap::new(); map.insert(~"id", json::String(script.id)); map.insert(~"name", json::String(script.name)); map.insert(~"vers", json::String(script.vers.to_str())); map.insert(~"deps", json::List(do script.deps.map |&dep| { let (url, target) = dep; - let mut inner = ~LinearMap::new(); + let mut inner = ~HashMap::new(); inner.insert(~"url", json::String(url)); @@ -921,7 +921,7 @@ pub fn main() { Ctx { cfgs: cfgs, json: json, - dep_cache: @mut LinearMap::new() + dep_cache: @mut HashMap::new() }.run(cmd, args); } diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs index 15546e96653..9d3751c3de2 100644 --- a/src/librustpkg/util.rs +++ b/src/librustpkg/util.rs @@ -10,7 +10,7 @@ use core::*; use core::hash::Streaming; -use core::hashmap::LinearMap; +use core::hashmap::HashMap; use rustc::driver::{driver, session}; use rustc::metadata::filesearch; use std::getopts::groups::getopts; @@ -337,7 +337,7 @@ fn _add_pkg(packages: ~[json::Json], pkg: &Package) -> ~[json::Json] { } } - let mut map = ~LinearMap::new(); + let mut map = ~HashMap::new(); map.insert(~"id", json::String(pkg.id)); map.insert(~"vers", json::String(pkg.vers.to_str())); -- cgit 1.4.1-3-g733a5