From 8342fe75f2925cda4787561272eec87efe596303 Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Mon, 20 Sep 2021 22:34:02 -0700
Subject: [PATCH] Cleanup more for std::simd also

---
 crates/core_simd/src/lib.rs |  3 ++-
 crates/core_simd/src/mod.rs | 18 ++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/crates/core_simd/src/lib.rs b/crates/core_simd/src/lib.rs
index 279999b09e2..486905e4d81 100644
--- a/crates/core_simd/src/lib.rs
+++ b/crates/core_simd/src/lib.rs
@@ -16,4 +16,5 @@
 
 #[path = "mod.rs"]
 mod core_simd;
-pub use self::core_simd::simd::*;
+use self::core_simd::simd;
+pub use simd::*;
diff --git a/crates/core_simd/src/mod.rs b/crates/core_simd/src/mod.rs
index 251091c1dc3..5696570d23e 100644
--- a/crates/core_simd/src/mod.rs
+++ b/crates/core_simd/src/mod.rs
@@ -3,31 +3,29 @@ mod permute;
 #[macro_use]
 mod reduction;
 
-mod select;
+pub(crate) mod intrinsics;
 
 #[cfg(feature = "generic_const_exprs")]
 mod to_bytes;
 
 mod comparisons;
 mod fmt;
-mod intrinsics;
 mod iter;
+mod lane_count;
+mod masks;
 mod math;
 mod ops;
 mod round;
-mod vendor;
-
-mod lane_count;
-
-mod masks;
-
+mod select;
 mod vector;
+mod vendor;
 
 #[doc = include_str!("core_simd_docs.md")]
 pub mod simd {
-    pub use crate::core_simd::lane_count::*;
+    pub(crate) use crate::core_simd::intrinsics;
+
+    pub use crate::core_simd::lane_count::{LaneCount, SupportedLaneCount};
     pub use crate::core_simd::masks::*;
     pub use crate::core_simd::select::Select;
     pub use crate::core_simd::vector::*;
-    pub(crate) use crate::core_simd::*;
 }