From d5ef055ba904de9624edb0ce9ee02bc523d3dc31 Mon Sep 17 00:00:00 2001
From: gnzlbg <gonzalobg88@gmail.com>
Date: Wed, 30 Jan 2019 13:21:24 +0100
Subject: [PATCH] Fix building docs for all targets on docs.rs and re-export
 the arch module

---
 library/stdarch/crates/core_arch/Cargo.toml |  3 ++
 library/stdarch/crates/core_arch/src/lib.rs | 45 +++------------------
 library/stdarch/examples/hex.rs             |  4 +-
 library/stdarch/examples/wasm.rs            |  2 +-
 4 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/library/stdarch/crates/core_arch/Cargo.toml b/library/stdarch/crates/core_arch/Cargo.toml
index cbd3ecbed9ef..de29afeebc5b 100644
--- a/library/stdarch/crates/core_arch/Cargo.toml
+++ b/library/stdarch/crates/core_arch/Cargo.toml
@@ -32,3 +32,6 @@ wasm-bindgen-test = "=0.2.19"
 [features]
 # Internal-usage only: denies all warnings.
 strict = []
+
+[package.metadata.docs.rs]
+rustdoc-args = [ "--cfg dox" ]
\ No newline at end of file
diff --git a/library/stdarch/crates/core_arch/src/lib.rs b/library/stdarch/crates/core_arch/src/lib.rs
index 9b346fefc62c..1853c44fb0bb 100644
--- a/library/stdarch/crates/core_arch/src/lib.rs
+++ b/library/stdarch/crates/core_arch/src/lib.rs
@@ -83,45 +83,10 @@ extern crate wasm_bindgen_test;
 #[path = "mod.rs"]
 mod core_arch;
 
-pub use core_arch::arch;
+pub use core_arch::arch::*;
 
 #[allow(unused_imports)]
-use _core::clone;
-#[allow(unused_imports)]
-use _core::cmp;
-#[allow(unused_imports)]
-use _core::convert;
-#[allow(unused_imports)]
-use _core::default;
-#[allow(unused_imports)]
-use _core::fmt;
-#[allow(unused_imports)]
-use _core::hash;
-#[allow(unused_imports)]
-use _core::intrinsics;
-#[allow(unused_imports)]
-use _core::iter;
-#[allow(unused_imports)]
-use _core::marker;
-#[allow(unused_imports)]
-use _core::mem;
-#[allow(unused_imports)]
-use _core::num;
-#[allow(unused_imports)]
-use _core::ops;
-#[allow(unused_imports)]
-use _core::option;
-#[allow(unused_imports)]
-use _core::prelude;
-#[allow(unused_imports)]
-use _core::ptr;
-#[allow(unused_imports)]
-use _core::result;
-#[allow(unused_imports)]
-use _core::slice;
-#[allow(unused_imports)]
-use _core::sync;
-#[allow(unused_imports)]
-use _core::u128;
-#[allow(unused_imports)]
-use _core::u8;
+use _core::{
+    clone, cmp, convert, default, fmt, hash, intrinsics, iter, marker, mem, num, ops, option,
+    prelude, ptr, result, slice, sync, u128, u8,
+};
diff --git a/library/stdarch/examples/hex.rs b/library/stdarch/examples/hex.rs
index 9e6c84c11d25..8b9a4cdd0d0d 100644
--- a/library/stdarch/examples/hex.rs
+++ b/library/stdarch/examples/hex.rs
@@ -42,9 +42,9 @@ use std::io::{self, Read};
 use std::str;
 
 #[cfg(target_arch = "x86")]
-use core_arch::arch::x86::*;
+use core_arch::x86::*;
 #[cfg(target_arch = "x86_64")]
-use core_arch::arch::x86_64::*;
+use core_arch::x86_64::*;
 
 fn main() {
     let mut input = Vec::new();
diff --git a/library/stdarch/examples/wasm.rs b/library/stdarch/examples/wasm.rs
index 93124e692779..e6006df06ec5 100644
--- a/library/stdarch/examples/wasm.rs
+++ b/library/stdarch/examples/wasm.rs
@@ -7,7 +7,7 @@ extern crate core_arch;
 
 use std::ptr;
 
-use core_arch::arch::wasm32::*;
+use core_arch::wasm32::*;
 
 static mut HEAD: *mut *mut u8 = 0 as _;