1 files changed, 18 insertions, 20 deletions
diff --git a/tests/unit/net/resource_thread.rs b/tests/unit/net/resource_thread.rs
index 2d3d52f589e..fd9140befd9 100644
--- a/tests/unit/net/resource_thread.rs
+++ b/tests/unit/net/resource_thread.rs
@@ -36,7 +36,7 @@ fn test_bad_scheme() {
 fn test_parse_hostsfile() {
     let mock_hosts_file_content = "127.0.0.1 foo.bar.com\n127.0.0.2 servo.test.server";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(2, (*hosts_table).len());
+    assert_eq!(2, hosts_table.len());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"foo.bar.com".to_owned()).unwrap());
     assert_eq!("127.0.0.2".to_owned(), *hosts_table.get(&"servo.test.server".to_owned()).unwrap());
 }
@@ -45,7 +45,7 @@ fn test_parse_hostsfile() {
 fn test_parse_malformed_hostsfile() {
     let mock_hosts_file_content = "malformed file\n127.0.0.1 foo.bar.com\nservo.test.server 127.0.0.1";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(1, (*hosts_table).len());
+    assert_eq!(1, hosts_table.len());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"foo.bar.com".to_owned()).unwrap());
 }
 
@@ -53,7 +53,7 @@ fn test_parse_malformed_hostsfile() {
 fn test_parse_hostsfile_with_line_comment() {
     let mock_hosts_file_content = "# this is a line comment\n127.0.0.1 foo.bar.com\n# anothercomment";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(1, (*hosts_table).len());
+    assert_eq!(1, hosts_table.len());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"foo.bar.com".to_owned()).unwrap());
 }
 
@@ -61,7 +61,7 @@ fn test_parse_hostsfile_with_line_comment() {
 fn test_parse_hostsfile_with_end_of_line_comment() {
     let mock_hosts_file_content = "127.0.0.1 foo.bar.com # line ending comment\n127.0.0.2 servo.test.server #comment";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(2, (*hosts_table).len());
+    assert_eq!(2, hosts_table.len());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"foo.bar.com".to_owned()).unwrap());
     assert_eq!("127.0.0.2".to_owned(), *hosts_table.get(&"servo.test.server".to_owned()).unwrap());
 }
@@ -70,7 +70,7 @@ fn test_parse_hostsfile_with_end_of_line_comment() {
 fn test_parse_hostsfile_with_2_hostnames_for_1_address() {
     let mock_hosts_file_content = "127.0.0.1 foo.bar.com baz.bar.com";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(2, (*hosts_table).len());
+    assert_eq!(2, hosts_table.len());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"foo.bar.com".to_owned()).unwrap());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"baz.bar.com".to_owned()).unwrap());
 }
@@ -79,7 +79,7 @@ fn test_parse_hostsfile_with_2_hostnames_for_1_address() {
 fn test_parse_hostsfile_with_4_hostnames_for_1_address() {
     let mock_hosts_file_content = "127.0.0.1 moz.foo.com moz.bar.com moz.baz.com moz.moz.com";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(4, (*hosts_table).len());
+    assert_eq!(4, hosts_table.len());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"moz.foo.com".to_owned()).unwrap());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"moz.bar.com".to_owned()).unwrap());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"moz.baz.com".to_owned()).unwrap());
@@ -90,7 +90,7 @@ fn test_parse_hostsfile_with_4_hostnames_for_1_address() {
 fn test_parse_hostsfile_with_tabs_instead_spaces() {
     let mock_hosts_file_content = "127.0.0.1\tfoo.bar.com\n127.0.0.2\tservo.test.server";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(2, (*hosts_table).len());
+    assert_eq!(2, hosts_table.len());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"foo.bar.com".to_owned()).unwrap());
     assert_eq!("127.0.0.2".to_owned(), *hosts_table.get(&"servo.test.server".to_owned()).unwrap());
 }
@@ -101,7 +101,7 @@ fn test_parse_hostsfile_with_valid_ipv4_addresses()
     let mock_hosts_file_content =
         "255.255.255.255 foo.bar.com\n169.0.1.201 servo.test.server\n192.168.5.0 servo.foo.com";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(3, (*hosts_table).len());
+    assert_eq!(3, hosts_table.len());
 }
 
 #[test]
@@ -110,7 +110,7 @@ fn test_parse_hostsfile_with_invalid_ipv4_addresses()
     let mock_hosts_file_content = "256.255.255.255 foo.bar.com\n169.0.1000.201 servo.test.server \
                                    \n192.168.5.500 servo.foo.com\n192.abc.100.2 test.servo.com";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(0, (*hosts_table).len());
+    assert_eq!(0, hosts_table.len());
 }
 
 #[test]
@@ -124,7 +124,7 @@ fn test_parse_hostsfile_with_valid_ipv6_addresses()
                                    2001:0DB8:85A3:0042:1000:8A2E:0370:7334 baz.bar.moz\n\
                                    :: unspecified.moz.com";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(9, (*hosts_table).len());
+    assert_eq!(9, hosts_table.len());
 }
 
 #[test]
@@ -134,7 +134,7 @@ fn test_parse_hostsfile_with_invalid_ipv6_addresses()
                                    2001:zdb8:0:0:0:gg00:42:t329 moz.foo.com\n\
                                    2002:0DB8:85A3:0042:1000:8A2E:0370:7334/1289 baz3.bar.moz";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(0, (*hosts_table).len());
+    assert_eq!(0, hosts_table.len());
 }
 
 #[test]
@@ -144,7 +144,7 @@ fn test_parse_hostsfile_with_end_of_line_whitespace()
                                    2001:db8:0:0:0:ff00:42:8329 moz.foo.com\n \
                                    127.0.0.2 servo.test.server ";
     let hosts_table = parse_hostsfile(mock_hosts_file_content);
-    assert_eq!(3, (*hosts_table).len());
+    assert_eq!(3, hosts_table.len());
     assert_eq!("127.0.0.1".to_owned(), *hosts_table.get(&"foo.bar.com".to_owned()).unwrap());
     assert_eq!("2001:db8:0:0:0:ff00:42:8329".to_owned(), *hosts_table.get(&"moz.foo.com".to_owned()).unwrap());
     assert_eq!("127.0.0.2".to_owned(), *hosts_table.get(&"servo.test.server".to_owned()).unwrap());
@@ -152,20 +152,18 @@ fn test_parse_hostsfile_with_end_of_line_whitespace()
 
 #[test]
 fn test_replace_hosts() {
-    let mut host_table_box = Box::new(HashMap::new());
-    host_table_box.insert("foo.bar.com".to_owned(), "127.0.0.1".to_owned());
-    host_table_box.insert("servo.test.server".to_owned(), "127.0.0.2".to_owned());
-
-    let host_table: *mut HashMap<String, String> = Box::into_raw(host_table_box);
+    let mut host_table = HashMap::new();
+    host_table.insert("foo.bar.com".to_owned(), "127.0.0.1".to_owned());
+    host_table.insert("servo.test.server".to_owned(), "127.0.0.2".to_owned());
 
     let url = url!("http://foo.bar.com:8000/foo");
-    assert_eq!(host_replacement(host_table, &url).domain().unwrap(), "127.0.0.1");
+    assert_eq!(host_replacement(&host_table, &url).domain().unwrap(), "127.0.0.1");
 
     let url = url!("http://servo.test.server");
-    assert_eq!(host_replacement(host_table, &url).domain().unwrap(), "127.0.0.2");
+    assert_eq!(host_replacement(&host_table, &url).domain().unwrap(), "127.0.0.2");
 
     let url = url!("http://a.foo.bar.com");
-    assert_eq!(host_replacement(host_table, &url).domain().unwrap(), "a.foo.bar.com");
+    assert_eq!(host_replacement(&host_table, &url).domain().unwrap(), "a.foo.bar.com");
 }
 
 #[test]