From 44029a5bbc4812f7144ee8d0d4ee95d52aeca6cf Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Wed, 3 Apr 2013 08:45:14 -0400
Subject: hashmap: rm linear namespace

---
 src/libstd/json.rs      | 4 ++--
 src/libstd/net_url.rs   | 4 ++--
 src/libstd/serialize.rs | 2 +-
 src/libstd/workcache.rs | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index e090d6bc036..1b79708e590 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -16,7 +16,7 @@
 
 use core::prelude::*;
 use core::io::{WriterUtil, ReaderUtil};
-use core::hashmap::linear::LinearMap;
+use core::hashmap::LinearMap;
 
 use serialize::Encodable;
 use serialize;
@@ -1161,7 +1161,7 @@ mod tests {
     use super::*;
 
     use core::prelude::*;
-    use core::hashmap::linear::LinearMap;
+    use core::hashmap::LinearMap;
 
     use std::serialize::Decodable;
 
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index d23784953ef..b32a9841ac6 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -17,7 +17,7 @@ use core::from_str::FromStr;
 use core::io::{Reader, ReaderUtil};
 use core::io;
 use core::prelude::*;
-use core::hashmap::linear::LinearMap;
+use core::hashmap::LinearMap;
 use core::str;
 use core::to_bytes::IterBytes;
 use core::to_bytes;
@@ -818,7 +818,7 @@ mod tests {
 
     use net_url::*;
 
-    use core::hashmap::linear::LinearMap;
+    use core::hashmap::LinearMap;
 
     #[test]
     pub fn test_url_parse() {
diff --git a/src/libstd/serialize.rs b/src/libstd/serialize.rs
index ddc84e07a35..88ae58ee01b 100644
--- a/src/libstd/serialize.rs
+++ b/src/libstd/serialize.rs
@@ -17,7 +17,7 @@ Core encoding and decoding interfaces.
 #[forbid(non_camel_case_types)];
 
 use core::prelude::*;
-use core::hashmap::linear::{LinearMap, LinearSet};
+use core::hashmap::{LinearMap, LinearSet};
 use core::trie::{TrieMap, TrieSet};
 use deque::Deque;
 use dlist::DList;
diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs
index 6ed1364d7fc..6886d5d630e 100644
--- a/src/libstd/workcache.rs
+++ b/src/libstd/workcache.rs
@@ -24,7 +24,7 @@ use core::pipes::recv;
 use core::prelude::*;
 use core::result;
 use core::run;
-use core::hashmap::linear::LinearMap;
+use core::hashmap::LinearMap;
 use core::task;
 use core::to_bytes;
 
-- 
cgit 1.4.1-3-g733a5