From 2a5c4133f9da508949e875ed41b60a2d041e17c7 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Thu, 30 Nov 2017 16:49:57 +0100
Subject: [PATCH] Make tests/units/* compile without warnings in non-test mode

(if not usefully)
---
 tests/unit/gfx/lib.rs        |  4 +++-
 tests/unit/layout/lib.rs     |  5 ++---
 tests/unit/metrics/lib.rs    |  4 ++--
 tests/unit/msg/lib.rs        |  5 ++---
 tests/unit/net/lib.rs        | 26 ++++++++++++++------------
 tests/unit/net_traits/lib.rs |  6 ++++--
 tests/unit/profile/lib.rs    |  3 ++-
 7 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/tests/unit/gfx/lib.rs b/tests/unit/gfx/lib.rs
index 9a5040b6fe1a..a8120a50138c 100644
--- a/tests/unit/gfx/lib.rs
+++ b/tests/unit/gfx/lib.rs
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![cfg(test)]
+
 extern crate gfx;
 
-#[cfg(test)] mod text_util;
+mod text_util;
diff --git a/tests/unit/layout/lib.rs b/tests/unit/layout/lib.rs
index a763135260a5..d9e72841199c 100644
--- a/tests/unit/layout/lib.rs
+++ b/tests/unit/layout/lib.rs
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-extern crate layout;
-#[macro_use] extern crate size_of_test;
-
+#[cfg(all(test, target_pointer_width = "64"))] extern crate layout;
+#[cfg(all(test, target_pointer_width = "64"))] #[macro_use] extern crate size_of_test;
 #[cfg(all(test, target_pointer_width = "64"))] mod size_of;
diff --git a/tests/unit/metrics/lib.rs b/tests/unit/metrics/lib.rs
index abd6970f8485..d773a6328670 100644
--- a/tests/unit/metrics/lib.rs
+++ b/tests/unit/metrics/lib.rs
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![cfg(test)]
+
 extern crate euclid;
 extern crate gfx;
 extern crate gfx_traits;
@@ -13,7 +15,5 @@ extern crate profile_traits;
 extern crate style;
 extern crate time;
 
-#[cfg(test)]
 mod interactive_time;
-#[cfg(test)]
 mod paint_time;
diff --git a/tests/unit/msg/lib.rs b/tests/unit/msg/lib.rs
index c1bc9a119d93..62e591ef8005 100644
--- a/tests/unit/msg/lib.rs
+++ b/tests/unit/msg/lib.rs
@@ -2,7 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-extern crate msg;
-#[macro_use] extern crate size_of_test;
-
+#[cfg(all(test, target_pointer_width = "64"))] extern crate msg;
+#[cfg(all(test, target_pointer_width = "64"))] #[macro_use] extern crate size_of_test;
 #[cfg(all(test, target_pointer_width = "64"))] mod size_of;
diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs
index 1d34d700a604..773b7f387f8e 100644
--- a/tests/unit/net/lib.rs
+++ b/tests/unit/net/lib.rs
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![cfg(test)]
+
 extern crate cookie as cookie_rs;
 extern crate devtools_traits;
 extern crate flate2;
@@ -19,18 +21,18 @@ extern crate time;
 extern crate unicase;
 extern crate url;
 
-#[cfg(test)] mod chrome_loader;
-#[cfg(test)] mod cookie;
-#[cfg(test)] mod cookie_http_state;
-#[cfg(test)] mod data_loader;
-#[cfg(test)] mod file_loader;
-#[cfg(test)] mod fetch;
-#[cfg(test)] mod mime_classifier;
-#[cfg(test)] mod resource_thread;
-#[cfg(test)] mod hsts;
-#[cfg(test)] mod http_loader;
-#[cfg(test)] mod filemanager_thread;
-#[cfg(test)] mod subresource_integrity;
+mod chrome_loader;
+mod cookie;
+mod cookie_http_state;
+mod data_loader;
+mod fetch;
+mod file_loader;
+mod filemanager_thread;
+mod hsts;
+mod http_loader;
+mod mime_classifier;
+mod resource_thread;
+mod subresource_integrity;
 
 use devtools_traits::DevtoolsControlMsg;
 use hyper::server::{Handler, Listening, Server};
diff --git a/tests/unit/net_traits/lib.rs b/tests/unit/net_traits/lib.rs
index 3f722e5fc635..64135a6a2d44 100644
--- a/tests/unit/net_traits/lib.rs
+++ b/tests/unit/net_traits/lib.rs
@@ -2,10 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![cfg(test)]
+
 extern crate net_traits;
 
-#[cfg(test)] mod image;
-#[cfg(test)] mod pub_domains;
+mod image;
+mod pub_domains;
 
 #[test]
 fn test_trim_http_whitespace() {
diff --git a/tests/unit/profile/lib.rs b/tests/unit/profile/lib.rs
index 110d8adedb4d..2b97cd68cb3d 100644
--- a/tests/unit/profile/lib.rs
+++ b/tests/unit/profile/lib.rs
@@ -2,10 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#![cfg(test)]
+
 extern crate ipc_channel;
 extern crate profile;
 extern crate profile_traits;
 extern crate servo_allocator;
 
-#[cfg(test)]
 mod time;