diff --git a/src/base/blas_uninit.rs b/src/base/blas_uninit.rs index 3fcfa6e1..33a7aa70 100644 --- a/src/base/blas_uninit.rs +++ b/src/base/blas_uninit.rs @@ -13,16 +13,17 @@ use matrixmultiply; use num::{One, Zero}; use simba::scalar::{ClosedAdd, ClosedMul}; #[cfg(feature = "std")] -use std::mem; +use std::{any::TypeId, mem}; use crate::base::constraint::{ AreMultipliable, DimEq, SameNumberOfColumns, SameNumberOfRows, ShapeConstraint, }; -use crate::base::dimension::{Dim, Dyn, U1}; +#[cfg(feature = "std")] +use crate::base::dimension::Dyn; +use crate::base::dimension::{Dim, U1}; use crate::base::storage::{RawStorage, RawStorageMut}; use crate::base::uninit::InitStatus; use crate::base::{Matrix, Scalar, Vector}; -use std::any::TypeId; // # Safety // The content of `y` must only contain values for which diff --git a/src/base/conversion.rs b/src/base/conversion.rs index 22774287..50ebd273 100644 --- a/src/base/conversion.rs +++ b/src/base/conversion.rs @@ -8,11 +8,11 @@ use simba::simd::{PrimitiveSimdValue, SimdValue}; use crate::base::allocator::{Allocator, SameShapeAllocator}; use crate::base::constraint::{SameNumberOfColumns, SameNumberOfRows, ShapeConstraint}; -#[cfg(any(feature = "std", feature = "alloc"))] -use crate::base::dimension::Dyn; use crate::base::dimension::{ - Const, Dim, DimName, U1, U10, U11, U12, U13, U14, U15, U16, U2, U3, U4, U5, U6, U7, U8, U9, + Const, Dim, U1, U10, U11, U12, U13, U14, U15, U16, U2, U3, U4, U5, U6, U7, U8, U9, }; +#[cfg(any(feature = "std", feature = "alloc"))] +use crate::base::dimension::{DimName, Dyn}; use crate::base::iter::{MatrixIter, MatrixIterMut}; use crate::base::storage::{IsContiguous, RawStorage, RawStorageMut}; use crate::base::{ diff --git a/src/base/default_allocator.rs b/src/base/default_allocator.rs index ff645d62..3c132413 100644 --- a/src/base/default_allocator.rs +++ b/src/base/default_allocator.rs @@ -12,14 +12,16 @@ use alloc::vec::Vec; use super::Const; use crate::base::allocator::{Allocator, Reallocator}; use crate::base::array_storage::ArrayStorage; +use crate::base::dimension::Dim; #[cfg(any(feature = "alloc", feature = "std"))] -use crate::base::dimension::Dyn; -use crate::base::dimension::{Dim, DimName}; +use crate::base::dimension::{DimName, Dyn}; use crate::base::storage::{RawStorage, RawStorageMut}; #[cfg(any(feature = "std", feature = "alloc"))] use crate::base::vec_storage::VecStorage; use crate::base::Scalar; -use std::mem::{ManuallyDrop, MaybeUninit}; +#[cfg(any(feature = "std", feature = "alloc"))] +use std::mem::ManuallyDrop; +use std::mem::MaybeUninit; /* *