M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build without default features

This commit is contained in:
Lishen 2023-11-21 18:06:22 +03:00
parent 3bc3df09a1
commit d65b457410
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/base/conversion.rs
View File

@ -19,14 +19,15 @@ use crate::base::{
ArrayStorage, DVectorView, DVectorViewMut, DefaultAllocator, Matrix, MatrixView, MatrixViewMut, ArrayStorage, DVectorView, DVectorViewMut, DefaultAllocator, Matrix, MatrixView, MatrixViewMut,
OMatrix, Scalar, OMatrix, Scalar,
}; };
//TODO: move near From implementation?
#[cfg(any(feature = "std", feature = "alloc"))] #[cfg(any(feature = "std", feature = "alloc"))]
use crate::base::{DVector, RowDVector, VecStorage}; use crate::base::{DMatrixView, SMatrixView, SVectorView};
#[cfg(any(feature = "std", feature = "alloc"))]
use crate::base::{DMatrix, DVector, RowDVector, VecStorage};
use crate::base::{ViewStorage, ViewStorageMut}; use crate::base::{ViewStorage, ViewStorageMut};
use crate::constraint::DimEq; use crate::constraint::DimEq;
use crate::{ use crate::{IsNotStaticOne, RowSVector, SMatrix, SVector, VectorView, VectorViewMut};
DMatrix, DMatrixView, IsNotStaticOne, RowSVector, SMatrix, SMatrixView, SVector, SVectorView,
VectorView, VectorViewMut,
};
use std::mem::MaybeUninit; use std::mem::MaybeUninit;
// TODO: too bad this won't work for slice conversions. // TODO: too bad this won't work for slice conversions.
@ -431,18 +432,23 @@ where
} }
} }
#[cfg(any(feature = "std", feature = "alloc"))]
impl<'a, T: Scalar, const R: usize, const C: usize> From<&'a DMatrix<T>> for SMatrix<T, R, C> { impl<'a, T: Scalar, const R: usize, const C: usize> From<&'a DMatrix<T>> for SMatrix<T, R, C> {
fn from(m: &'a DMatrix<T>) -> Self { fn from(m: &'a DMatrix<T>) -> Self {
let v: DMatrixView<'a, T> = m.as_view(); let v: DMatrixView<'a, T> = m.as_view();
SMatrixView::<T, R, C>::from(&v).clone_owned() SMatrixView::<T, R, C>::from(&v).clone_owned()
} }
} }
#[cfg(any(feature = "std", feature = "alloc"))]
impl<'a, T: Scalar, const R: usize, const C: usize> From<&'a SMatrix<T, R, C>> for DMatrix<T> { impl<'a, T: Scalar, const R: usize, const C: usize> From<&'a SMatrix<T, R, C>> for DMatrix<T> {
fn from(m: &'a SMatrix<T, R, C>) -> Self { fn from(m: &'a SMatrix<T, R, C>) -> Self {
let v: SMatrixView<'a, T, R, C> = m.as_view(); let v: SMatrixView<'a, T, R, C> = m.as_view();
DMatrixView::<T>::from(&v).clone_owned() DMatrixView::<T>::from(&v).clone_owned()
} }
} }
#[cfg(any(feature = "std", feature = "alloc"))]
impl<'a, T: Scalar, const R: usize> From<&'a DVector<T>> for SVector<T, R> { impl<'a, T: Scalar, const R: usize> From<&'a DVector<T>> for SVector<T, R> {
fn from(m: &'a DVector<T>) -> Self { fn from(m: &'a DVector<T>) -> Self {
let v: DVectorView<'a, T> = m.as_view(); let v: DVectorView<'a, T> = m.as_view();
@ -450,6 +456,7 @@ impl<'a, T: Scalar, const R: usize> From<&'a DVector<T>> for SVector<T, R> {
} }
} }
#[cfg(any(feature = "std", feature = "alloc"))]
impl<'a, T: Scalar, const R: usize> From<&'a SVector<T, R>> for DVector<T> { impl<'a, T: Scalar, const R: usize> From<&'a SVector<T, R>> for DVector<T> {
fn from(m: &'a SVector<T, R>) -> Self { fn from(m: &'a SVector<T, R>) -> Self {
let v: SVectorView<'a, T, R> = m.as_view(); let v: SVectorView<'a, T, R> = m.as_view();