diff --git a/nalgebra-lapack/src/cholesky.rs b/nalgebra-lapack/src/cholesky.rs index ba7830a5f..c76a26763 100644 --- a/nalgebra-lapack/src/cholesky.rs +++ b/nalgebra-lapack/src/cholesky.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use num::Zero; use num_complex::Complex; @@ -18,7 +18,7 @@ use lapack; serde( bound( serialize = "DefaultAllocator: Allocator, - MatrixN: serde::Serialize" + MatrixN: Serialize" ) ) )] @@ -27,7 +27,7 @@ use lapack; serde( bound( deserialize = "DefaultAllocator: Allocator, - MatrixN: serde::Deserialize<'de>" + MatrixN: Deserialize<'de>" ) ) )] diff --git a/nalgebra-lapack/src/eigen.rs b/nalgebra-lapack/src/eigen.rs index e406f5706..4fe74ce3c 100644 --- a/nalgebra-lapack/src/eigen.rs +++ b/nalgebra-lapack/src/eigen.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use num::Zero; use num_complex::Complex; @@ -21,8 +21,8 @@ use lapack; serde( bound( serialize = "DefaultAllocator: Allocator + Allocator, - VectorN: serde::Serialize, - MatrixN: serde::Serialize" + VectorN: Serialize, + MatrixN: Serialize" ) ) )] @@ -31,8 +31,8 @@ use lapack; serde( bound( deserialize = "DefaultAllocator: Allocator + Allocator, - VectorN: serde::Serialize, - MatrixN: serde::Deserialize<'de>" + VectorN: Serialize, + MatrixN: Deserialize<'de>" ) ) )] diff --git a/nalgebra-lapack/src/hessenberg.rs b/nalgebra-lapack/src/hessenberg.rs index 6c1925f49..c42e349bb 100644 --- a/nalgebra-lapack/src/hessenberg.rs +++ b/nalgebra-lapack/src/hessenberg.rs @@ -17,8 +17,8 @@ use lapack; bound( serialize = "DefaultAllocator: Allocator + Allocator>, - MatrixN: serde::Serialize, - VectorN>: serde::Serialize" + MatrixN: Serialize, + VectorN>: Serialize" ) ) )] @@ -28,8 +28,8 @@ use lapack; bound( deserialize = "DefaultAllocator: Allocator + Allocator>, - MatrixN: serde::Deserialize<'de>, - VectorN>: serde::Deserialize<'de>" + MatrixN: Deserialize<'de>, + VectorN>: Deserialize<'de>" ) ) )] diff --git a/nalgebra-lapack/src/lu.rs b/nalgebra-lapack/src/lu.rs index 4d3f1d94e..4fb5a72f1 100644 --- a/nalgebra-lapack/src/lu.rs +++ b/nalgebra-lapack/src/lu.rs @@ -24,8 +24,8 @@ use lapack; bound( serialize = "DefaultAllocator: Allocator + Allocator>, - MatrixMN: serde::Serialize, - PermutationSequence>: serde::Serialize" + MatrixMN: Serialize, + PermutationSequence>: Serialize" ) ) )] @@ -35,8 +35,8 @@ use lapack; bound( deserialize = "DefaultAllocator: Allocator + Allocator>, - MatrixMN: serde::Deserialize<'de>, - PermutationSequence>: serde::Deserialize<'de>" + MatrixMN: Deserialize<'de>, + PermutationSequence>: Deserialize<'de>" ) ) )] diff --git a/nalgebra-lapack/src/qr.rs b/nalgebra-lapack/src/qr.rs index 128a2f038..775fd10bf 100644 --- a/nalgebra-lapack/src/qr.rs +++ b/nalgebra-lapack/src/qr.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use num::Zero; use num_complex::Complex; @@ -20,8 +20,8 @@ use lapack; bound( serialize = "DefaultAllocator: Allocator + Allocator>, - MatrixMN: serde::Serialize, - VectorN>: serde::Serialize" + MatrixMN: Serialize, + VectorN>: Serialize" ) ) )] @@ -31,8 +31,8 @@ use lapack; bound( deserialize = "DefaultAllocator: Allocator + Allocator>, - MatrixMN: serde::Deserialize<'de>, - VectorN>: serde::Deserialize<'de>" + MatrixMN: Deserialize<'de>, + VectorN>: Deserialize<'de>" ) ) )] diff --git a/nalgebra-lapack/src/schur.rs b/nalgebra-lapack/src/schur.rs index eccc60d69..5f3bb4f05 100644 --- a/nalgebra-lapack/src/schur.rs +++ b/nalgebra-lapack/src/schur.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use num::Zero; use num_complex::Complex; @@ -21,8 +21,8 @@ use lapack; serde( bound( serialize = "DefaultAllocator: Allocator + Allocator, - VectorN: serde::Serialize, - MatrixN: serde::Serialize" + VectorN: Serialize, + MatrixN: Serialize" ) ) )] @@ -31,8 +31,8 @@ use lapack; serde( bound( deserialize = "DefaultAllocator: Allocator + Allocator, - VectorN: serde::Serialize, - MatrixN: serde::Deserialize<'de>" + VectorN: Serialize, + MatrixN: Deserialize<'de>" ) ) )] diff --git a/nalgebra-lapack/src/svd.rs b/nalgebra-lapack/src/svd.rs index ebfe1aaef..347f5b9ec 100644 --- a/nalgebra-lapack/src/svd.rs +++ b/nalgebra-lapack/src/svd.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use num::Signed; use std::cmp; @@ -20,9 +20,9 @@ use lapack; serialize = "DefaultAllocator: Allocator> + Allocator + Allocator, - MatrixN: serde::Serialize, - MatrixN: serde::Serialize, - VectorN>: serde::Serialize" + MatrixN: Serialize, + MatrixN: Serialize, + VectorN>: Serialize" ) ) )] @@ -33,9 +33,9 @@ use lapack; serialize = "DefaultAllocator: Allocator> + Allocator + Allocator, - MatrixN: serde::Deserialize<'de>, - MatrixN: serde::Deserialize<'de>, - VectorN>: serde::Deserialize<'de>" + MatrixN: Deserialize<'de>, + MatrixN: Deserialize<'de>, + VectorN>: Deserialize<'de>" ) ) )] diff --git a/nalgebra-lapack/src/symmetric_eigen.rs b/nalgebra-lapack/src/symmetric_eigen.rs index bf041bbef..6ec7e1e92 100644 --- a/nalgebra-lapack/src/symmetric_eigen.rs +++ b/nalgebra-lapack/src/symmetric_eigen.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use num::Zero; use std::ops::MulAssign; @@ -22,8 +22,8 @@ use lapack; bound( serialize = "DefaultAllocator: Allocator + Allocator, - VectorN: serde::Serialize, - MatrixN: serde::Serialize" + VectorN: Serialize, + MatrixN: Serialize" ) ) )] @@ -33,8 +33,8 @@ use lapack; bound( deserialize = "DefaultAllocator: Allocator + Allocator, - VectorN: serde::Deserialize<'de>, - MatrixN: serde::Deserialize<'de>" + VectorN: Deserialize<'de>, + MatrixN: Deserialize<'de>" ) ) )] diff --git a/src/geometry/isometry.rs b/src/geometry/isometry.rs index 80283c549..3eebb93a3 100644 --- a/src/geometry/isometry.rs +++ b/src/geometry/isometry.rs @@ -6,7 +6,7 @@ use std::io::{Result as IOResult, Write}; use std::marker::PhantomData; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; #[cfg(feature = "abomonation-serialize")] use abomonation::Abomonation; @@ -28,9 +28,9 @@ use geometry::{Point, Translation}; feature = "serde-serialize", serde( bound( - serialize = "R: serde::Serialize, + serialize = "R: Serialize, DefaultAllocator: Allocator, - Owned: serde::Serialize" + Owned: Serialize" ) ) )] @@ -38,9 +38,9 @@ use geometry::{Point, Translation}; feature = "serde-serialize", serde( bound( - deserialize = "R: serde::Deserialize<'de>, + deserialize = "R: Deserialize<'de>, DefaultAllocator: Allocator, - Owned: serde::Deserialize<'de>" + Owned: Deserialize<'de>" ) ) )] diff --git a/src/geometry/orthographic.rs b/src/geometry/orthographic.rs index 75eb92fff..728a1c1f1 100644 --- a/src/geometry/orthographic.rs +++ b/src/geometry/orthographic.rs @@ -3,7 +3,7 @@ use quickcheck::{Arbitrary, Gen}; use rand::distributions::{Distribution, Standard}; use rand::Rng; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize, Serializer, Deserializer}; use std::fmt; use alga::general::Real; @@ -43,20 +43,20 @@ impl PartialEq for Orthographic3 { } #[cfg(feature = "serde-serialize")] -impl serde::Serialize for Orthographic3 { +impl Serialize for Orthographic3 { fn serialize(&self, serializer: S) -> Result where - S: serde::Serializer, + S: Serializer, { self.matrix.serialize(serializer) } } #[cfg(feature = "serde-serialize")] -impl<'a, N: Real + serde::Deserialize<'a>> serde::Deserialize<'a> for Orthographic3 { +impl<'a, N: Real + Deserialize<'a>> Deserialize<'a> for Orthographic3 { fn deserialize(deserializer: Des) -> Result where - Des: serde::Deserializer<'a>, + Des: Deserializer<'a>, { let matrix = Matrix4::::deserialize(deserializer)?; diff --git a/src/geometry/perspective.rs b/src/geometry/perspective.rs index 933a73295..662d430b1 100644 --- a/src/geometry/perspective.rs +++ b/src/geometry/perspective.rs @@ -4,7 +4,7 @@ use rand::distributions::{Distribution, Standard}; use rand::Rng; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize, Serializer, Deserializer}; use std::fmt; use alga::general::Real; @@ -44,20 +44,20 @@ impl PartialEq for Perspective3 { } #[cfg(feature = "serde-serialize")] -impl serde::Serialize for Perspective3 { +impl Serialize for Perspective3 { fn serialize(&self, serializer: S) -> Result where - S: serde::Serializer, + S: Serializer, { self.matrix.serialize(serializer) } } #[cfg(feature = "serde-serialize")] -impl<'a, N: Real + serde::Deserialize<'a>> serde::Deserialize<'a> for Perspective3 { +impl<'a, N: Real + Deserialize<'a>> Deserialize<'a> for Perspective3 { fn deserialize(deserializer: Des) -> Result where - Des: serde::Deserializer<'a>, + Des: Deserializer<'a>, { let matrix = Matrix4::::deserialize(deserializer)?; diff --git a/src/geometry/point.rs b/src/geometry/point.rs index 6cd0a3a30..6b3e4d2d7 100644 --- a/src/geometry/point.rs +++ b/src/geometry/point.rs @@ -7,7 +7,7 @@ use std::hash; use std::io::{Result as IOResult, Write}; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize, Serializer, Deserializer}; #[cfg(feature = "abomonation-serialize")] use abomonation::Abomonation; @@ -57,28 +57,28 @@ where } #[cfg(feature = "serde-serialize")] -impl serde::Serialize for Point +impl Serialize for Point where DefaultAllocator: Allocator, - >::Buffer: serde::Serialize, + >::Buffer: Serialize, { fn serialize(&self, serializer: S) -> Result where - S: serde::Serializer, + S: Serializer, { self.coords.serialize(serializer) } } #[cfg(feature = "serde-serialize")] -impl<'a, N: Scalar, D: DimName> serde::Deserialize<'a> for Point +impl<'a, N: Scalar, D: DimName> Deserialize<'a> for Point where DefaultAllocator: Allocator, - >::Buffer: serde::Deserialize<'a>, + >::Buffer: Deserialize<'a>, { fn deserialize(deserializer: Des) -> Result where - Des: serde::Deserializer<'a>, + Des: Deserializer<'a>, { let coords = VectorN::::deserialize(deserializer)?; diff --git a/src/geometry/quaternion.rs b/src/geometry/quaternion.rs index d79997f08..47b62d6ca 100644 --- a/src/geometry/quaternion.rs +++ b/src/geometry/quaternion.rs @@ -8,7 +8,7 @@ use std::io::{Result as IOResult, Write}; #[cfg(feature = "serde-serialize")] use base::storage::Owned; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize, Serializer, Deserializer}; #[cfg(feature = "abomonation-serialize")] use abomonation::Abomonation; @@ -74,26 +74,26 @@ impl Clone for Quaternion { } #[cfg(feature = "serde-serialize")] -impl serde::Serialize for Quaternion +impl Serialize for Quaternion where - Owned: serde::Serialize, + Owned: Serialize, { fn serialize(&self, serializer: S) -> Result where - S: serde::Serializer, + S: Serializer, { self.coords.serialize(serializer) } } #[cfg(feature = "serde-serialize")] -impl<'a, N: Real> serde::Deserialize<'a> for Quaternion +impl<'a, N: Real> Deserialize<'a> for Quaternion where - Owned: serde::Deserialize<'a>, + Owned: Deserialize<'a>, { fn deserialize(deserializer: Des) -> Result where - Des: serde::Deserializer<'a>, + Des: Deserializer<'a>, { let coords = Vector4::::deserialize(deserializer)?; diff --git a/src/geometry/rotation.rs b/src/geometry/rotation.rs index ffcb2f759..0ceaa73bf 100644 --- a/src/geometry/rotation.rs +++ b/src/geometry/rotation.rs @@ -6,7 +6,7 @@ use std::hash; use std::io::{Result as IOResult, Write}; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize, Serializer, Deserializer}; #[cfg(feature = "serde-serialize")] use base::storage::Owned; @@ -80,28 +80,28 @@ where } #[cfg(feature = "serde-serialize")] -impl serde::Serialize for Rotation +impl Serialize for Rotation where DefaultAllocator: Allocator, - Owned: serde::Serialize, + Owned: Serialize, { fn serialize(&self, serializer: S) -> Result where - S: serde::Serializer, + S: Serializer, { self.matrix.serialize(serializer) } } #[cfg(feature = "serde-serialize")] -impl<'a, N: Scalar, D: DimName> serde::Deserialize<'a> for Rotation +impl<'a, N: Scalar, D: DimName> Deserialize<'a> for Rotation where DefaultAllocator: Allocator, - Owned: serde::Deserialize<'a>, + Owned: Deserialize<'a>, { fn deserialize(deserializer: Des) -> Result where - Des: serde::Deserializer<'a>, + Des: Deserializer<'a>, { let matrix = MatrixN::::deserialize(deserializer)?; diff --git a/src/geometry/similarity.rs b/src/geometry/similarity.rs index e339d283d..371be5f02 100644 --- a/src/geometry/similarity.rs +++ b/src/geometry/similarity.rs @@ -5,7 +5,7 @@ use std::hash; use std::io::{Result as IOResult, Write}; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; #[cfg(feature = "abomonation-serialize")] use abomonation::Abomonation; @@ -27,10 +27,10 @@ use geometry::{Isometry, Point, Translation}; feature = "serde-serialize", serde( bound( - serialize = "N: serde::Serialize, - R: serde::Serialize, + serialize = "N: Serialize, + R: Serialize, DefaultAllocator: Allocator, - Owned: serde::Serialize" + Owned: Serialize" ) ) )] @@ -38,10 +38,10 @@ use geometry::{Isometry, Point, Translation}; feature = "serde-serialize", serde( bound( - deserialize = "N: serde::Deserialize<'de>, - R: serde::Deserialize<'de>, + deserialize = "N: Deserialize<'de>, + R: Deserialize<'de>, DefaultAllocator: Allocator, - Owned: serde::Deserialize<'de>" + Owned: Deserialize<'de>" ) ) )] diff --git a/src/geometry/transform.rs b/src/geometry/transform.rs index 23ca5b296..7b393d21c 100644 --- a/src/geometry/transform.rs +++ b/src/geometry/transform.rs @@ -3,7 +3,7 @@ use std::fmt::Debug; use std::marker::PhantomData; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize, Serializer, Deserializer}; use alga::general::Real; @@ -191,28 +191,28 @@ where } #[cfg(feature = "serde-serialize")] -impl, C: TCategory> serde::Serialize for Transform +impl, C: TCategory> Serialize for Transform where DefaultAllocator: Allocator, DimNameSum>, - Owned, DimNameSum>: serde::Serialize, + Owned, DimNameSum>: Serialize, { fn serialize(&self, serializer: S) -> Result where - S: serde::Serializer, + S: Serializer, { self.matrix.serialize(serializer) } } #[cfg(feature = "serde-serialize")] -impl<'a, N: Real, D: DimNameAdd, C: TCategory> serde::Deserialize<'a> for Transform +impl<'a, N: Real, D: DimNameAdd, C: TCategory> Deserialize<'a> for Transform where DefaultAllocator: Allocator, DimNameSum>, - Owned, DimNameSum>: serde::Deserialize<'a>, + Owned, DimNameSum>: Deserialize<'a>, { fn deserialize(deserializer: Des) -> Result where - Des: serde::Deserializer<'a>, + Des: Deserializer<'a>, { let matrix = MatrixN::>::deserialize(deserializer)?; diff --git a/src/geometry/translation.rs b/src/geometry/translation.rs index 317e81772..ddf7651cd 100644 --- a/src/geometry/translation.rs +++ b/src/geometry/translation.rs @@ -6,7 +6,7 @@ use std::hash; use std::io::{Result as IOResult, Write}; #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize, Serializer, Deserializer}; #[cfg(feature = "abomonation-serialize")] use abomonation::Abomonation; @@ -80,28 +80,28 @@ where } #[cfg(feature = "serde-serialize")] -impl serde::Serialize for Translation +impl Serialize for Translation where DefaultAllocator: Allocator, - Owned: serde::Serialize, + Owned: Serialize, { fn serialize(&self, serializer: S) -> Result where - S: serde::Serializer, + S: Serializer, { self.vector.serialize(serializer) } } #[cfg(feature = "serde-serialize")] -impl<'a, N: Scalar, D: DimName> serde::Deserialize<'a> for Translation +impl<'a, N: Scalar, D: DimName> Deserialize<'a> for Translation where DefaultAllocator: Allocator, - Owned: serde::Deserialize<'a>, + Owned: Deserialize<'a>, { fn deserialize(deserializer: Des) -> Result where - Des: serde::Deserializer<'a>, + Des: Deserializer<'a>, { let matrix = VectorN::::deserialize(deserializer)?; diff --git a/src/linalg/bidiagonal.rs b/src/linalg/bidiagonal.rs index 062860784..db340a9ce 100644 --- a/src/linalg/bidiagonal.rs +++ b/src/linalg/bidiagonal.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::Real; use allocator::Allocator; @@ -21,9 +21,9 @@ use linalg::householder; DefaultAllocator: Allocator + Allocator> + Allocator, U1>>, - MatrixMN: serde::Serialize, - VectorN>: serde::Serialize, - VectorN, U1>>: serde::Serialize" + MatrixMN: Serialize, + VectorN>: Serialize, + VectorN, U1>>: Serialize" ) ) )] @@ -35,9 +35,9 @@ use linalg::householder; DefaultAllocator: Allocator + Allocator> + Allocator, U1>>, - MatrixMN: serde::Deserialize<'de>, - VectorN>: serde::Deserialize<'de>, - VectorN, U1>>: serde::Deserialize<'de>" + MatrixMN: Deserialize<'de>, + VectorN>: Deserialize<'de>, + VectorN, U1>>: Deserialize<'de>" ) ) )] diff --git a/src/linalg/cholesky.rs b/src/linalg/cholesky.rs index a77e6b2e2..d385ff0bc 100644 --- a/src/linalg/cholesky.rs +++ b/src/linalg/cholesky.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::Real; @@ -16,7 +16,7 @@ use storage::{Storage, StorageMut}; serde( bound( serialize = "DefaultAllocator: Allocator, - MatrixN: serde::Serialize" + MatrixN: Serialize" ) ) )] @@ -25,7 +25,7 @@ use storage::{Storage, StorageMut}; serde( bound( deserialize = "DefaultAllocator: Allocator, - MatrixN: serde::Deserialize<'de>" + MatrixN: Deserialize<'de>" ) ) )] diff --git a/src/linalg/eigen.rs b/src/linalg/eigen.rs index e45d59482..c9fe16e67 100644 --- a/src/linalg/eigen.rs +++ b/src/linalg/eigen.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::Real; use num_complex::Complex; @@ -24,8 +24,8 @@ use linalg::RealSchur; serde( bound( serialize = "DefaultAllocator: Allocator, - VectorN: serde::Serialize, - MatrixN: serde::Serialize" + VectorN: Serialize, + MatrixN: Serialize" ) ) )] @@ -34,8 +34,8 @@ use linalg::RealSchur; serde( bound( deserialize = "DefaultAllocator: Allocator, - VectorN: serde::Serialize, - MatrixN: serde::Deserialize<'de>" + VectorN: Serialize, + MatrixN: Deserialize<'de>" ) ) )] diff --git a/src/linalg/full_piv_lu.rs b/src/linalg/full_piv_lu.rs index 366c27bd6..695bc0cab 100644 --- a/src/linalg/full_piv_lu.rs +++ b/src/linalg/full_piv_lu.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::Real; use allocator::Allocator; @@ -19,8 +19,8 @@ use linalg::PermutationSequence; bound( serialize = "DefaultAllocator: Allocator + Allocator<(usize, usize), DimMinimum>, - MatrixMN: serde::Serialize, - PermutationSequence>: serde::Serialize" + MatrixMN: Serialize, + PermutationSequence>: Serialize" ) ) )] @@ -30,8 +30,8 @@ use linalg::PermutationSequence; bound( deserialize = "DefaultAllocator: Allocator + Allocator<(usize, usize), DimMinimum>, - MatrixMN: serde::Deserialize<'de>, - PermutationSequence>: serde::Deserialize<'de>" + MatrixMN: Deserialize<'de>, + PermutationSequence>: Deserialize<'de>" ) ) )] diff --git a/src/linalg/hessenberg.rs b/src/linalg/hessenberg.rs index 405adb5b0..a831cc2e0 100644 --- a/src/linalg/hessenberg.rs +++ b/src/linalg/hessenberg.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::Real; use allocator::Allocator; @@ -18,8 +18,8 @@ use linalg::householder; bound( serialize = "DefaultAllocator: Allocator + Allocator>, - MatrixN: serde::Serialize, - VectorN>: serde::Serialize" + MatrixN: Serialize, + VectorN>: Serialize" ) ) )] @@ -29,8 +29,8 @@ use linalg::householder; bound( deserialize = "DefaultAllocator: Allocator + Allocator>, - MatrixN: serde::Deserialize<'de>, - VectorN>: serde::Deserialize<'de>" + MatrixN: Deserialize<'de>, + VectorN>: Deserialize<'de>" ) ) )] diff --git a/src/linalg/lu.rs b/src/linalg/lu.rs index 0925b82be..7707242b8 100644 --- a/src/linalg/lu.rs +++ b/src/linalg/lu.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::{Field, Real}; use allocator::{Allocator, Reallocator}; @@ -19,8 +19,8 @@ use linalg::PermutationSequence; bound( serialize = "DefaultAllocator: Allocator + Allocator<(usize, usize), DimMinimum>, - MatrixMN: serde::Serialize, - PermutationSequence>: serde::Serialize" + MatrixMN: Serialize, + PermutationSequence>: Serialize" ) ) )] @@ -30,8 +30,8 @@ use linalg::PermutationSequence; bound( deserialize = "DefaultAllocator: Allocator + Allocator<(usize, usize), DimMinimum>, - MatrixMN: serde::Deserialize<'de>, - PermutationSequence>: serde::Deserialize<'de>" + MatrixMN: Deserialize<'de>, + PermutationSequence>: Deserialize<'de>" ) ) )] diff --git a/src/linalg/permutation_sequence.rs b/src/linalg/permutation_sequence.rs index 3d3fc5bda..b68187518 100644 --- a/src/linalg/permutation_sequence.rs +++ b/src/linalg/permutation_sequence.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::ClosedNeg; use num::One; @@ -18,7 +18,7 @@ use storage::StorageMut; serde( bound( serialize = "DefaultAllocator: Allocator<(usize, usize), D>, - VectorN<(usize, usize), D>: serde::Serialize" + VectorN<(usize, usize), D>: Serialize" ) ) )] @@ -27,7 +27,7 @@ use storage::StorageMut; serde( bound( deserialize = "DefaultAllocator: Allocator<(usize, usize), D>, - VectorN<(usize, usize), D>: serde::Deserialize<'de>" + VectorN<(usize, usize), D>: Deserialize<'de>" ) ) )] diff --git a/src/linalg/qr.rs b/src/linalg/qr.rs index c7892a9b5..f2092de77 100644 --- a/src/linalg/qr.rs +++ b/src/linalg/qr.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::Real; use base::{DefaultAllocator, Matrix, MatrixMN, MatrixN, Unit, VectorN}; @@ -16,13 +16,13 @@ use geometry::Reflection; #[cfg_attr(feature = "serde-serialize", serde(bound(serialize = "DefaultAllocator: Allocator + Allocator>, - MatrixMN: serde::Serialize, - VectorN>: serde::Serialize")))] + MatrixMN: Serialize, + VectorN>: Serialize")))] #[cfg_attr(feature = "serde-serialize", serde(bound(deserialize = "DefaultAllocator: Allocator + Allocator>, - MatrixMN: serde::Deserialize<'de>, - VectorN>: serde::Deserialize<'de>")))] + MatrixMN: Deserialize<'de>, + VectorN>: Deserialize<'de>")))] #[derive(Clone, Debug)] pub struct QR, C: Dim> where diff --git a/src/linalg/schur.rs b/src/linalg/schur.rs index ec2028c7c..25a73008f 100644 --- a/src/linalg/schur.rs +++ b/src/linalg/schur.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::Real; use num_complex::Complex; @@ -22,7 +22,7 @@ use linalg::Hessenberg; serde( bound( serialize = "DefaultAllocator: Allocator, - MatrixN: serde::Serialize" + MatrixN: Serialize" ) ) )] @@ -31,7 +31,7 @@ use linalg::Hessenberg; serde( bound( deserialize = "DefaultAllocator: Allocator, - MatrixN: serde::Deserialize<'de>" + MatrixN: Deserialize<'de>" ) ) )] diff --git a/src/linalg/svd.rs b/src/linalg/svd.rs index 2fe1f9859..87baddc95 100644 --- a/src/linalg/svd.rs +++ b/src/linalg/svd.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use num_complex::Complex; use std::ops::MulAssign; @@ -26,9 +26,9 @@ use linalg::Bidiagonal; Allocator> + Allocator, C> + Allocator>, - MatrixMN>: serde::Serialize, - MatrixMN, C>: serde::Serialize, - VectorN>: serde::Serialize" + MatrixMN>: Serialize, + MatrixMN, C>: Serialize, + VectorN>: Serialize" ) ) )] @@ -40,9 +40,9 @@ use linalg::Bidiagonal; Allocator> + Allocator, C> + Allocator>, - MatrixMN>: serde::Deserialize<'de>, - MatrixMN, C>: serde::Deserialize<'de>, - VectorN>: serde::Deserialize<'de>" + MatrixMN>: Deserialize<'de>, + MatrixMN, C>: Deserialize<'de>, + VectorN>: Deserialize<'de>" ) ) )] diff --git a/src/linalg/symmetric_eigen.rs b/src/linalg/symmetric_eigen.rs index 3ccd0e887..d7b2fd23b 100644 --- a/src/linalg/symmetric_eigen.rs +++ b/src/linalg/symmetric_eigen.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use num_complex::Complex; use std::ops::MulAssign; @@ -22,8 +22,8 @@ use linalg::SymmetricTridiagonal; bound( serialize = "DefaultAllocator: Allocator + Allocator, - VectorN: serde::Serialize, - MatrixN: serde::Serialize" + VectorN: Serialize, + MatrixN: Serialize" ) ) )] @@ -33,8 +33,8 @@ use linalg::SymmetricTridiagonal; bound( deserialize = "DefaultAllocator: Allocator + Allocator, - VectorN: serde::Deserialize<'de>, - MatrixN: serde::Deserialize<'de>" + VectorN: Deserialize<'de>, + MatrixN: Deserialize<'de>" ) ) )] diff --git a/src/linalg/symmetric_tridiagonal.rs b/src/linalg/symmetric_tridiagonal.rs index 16c7ba478..a1af96d03 100644 --- a/src/linalg/symmetric_tridiagonal.rs +++ b/src/linalg/symmetric_tridiagonal.rs @@ -1,5 +1,5 @@ #[cfg(feature = "serde-serialize")] -use serde; +use serde::{Serialize, Deserialize}; use alga::general::Real; use allocator::Allocator; @@ -17,8 +17,8 @@ use linalg::householder; bound( serialize = "DefaultAllocator: Allocator + Allocator>, - MatrixN: serde::Serialize, - VectorN>: serde::Serialize" + MatrixN: Serialize, + VectorN>: Serialize" ) ) )] @@ -28,8 +28,8 @@ use linalg::householder; bound( deserialize = "DefaultAllocator: Allocator + Allocator>, - MatrixN: serde::Deserialize<'de>, - VectorN>: serde::Deserialize<'de>" + MatrixN: Deserialize<'de>, + VectorN>: Deserialize<'de>" ) ) )]