From b272f3ba76613a03c53157e1b055590080c751de Mon Sep 17 00:00:00 2001
From: sebcrozet <developer@crozet.re>
Date: Thu, 13 Sep 2018 06:55:58 +0200
Subject: [PATCH] Fix compilation errors when the serde-serialize feature is
 enabled.

Fix #369.
---
 nalgebra-lapack/src/cholesky.rs        |  6 +++---
 nalgebra-lapack/src/eigen.rs           | 10 +++++-----
 nalgebra-lapack/src/hessenberg.rs      |  8 ++++----
 nalgebra-lapack/src/lu.rs              |  8 ++++----
 nalgebra-lapack/src/qr.rs              | 10 +++++-----
 nalgebra-lapack/src/schur.rs           | 10 +++++-----
 nalgebra-lapack/src/svd.rs             | 14 +++++++-------
 nalgebra-lapack/src/symmetric_eigen.rs | 10 +++++-----
 src/geometry/isometry.rs               | 10 +++++-----
 src/geometry/orthographic.rs           | 10 +++++-----
 src/geometry/perspective.rs            | 10 +++++-----
 src/geometry/point.rs                  | 14 +++++++-------
 src/geometry/quaternion.rs             | 14 +++++++-------
 src/geometry/rotation.rs               | 14 +++++++-------
 src/geometry/similarity.rs             | 14 +++++++-------
 src/geometry/transform.rs              | 14 +++++++-------
 src/geometry/translation.rs            | 14 +++++++-------
 src/linalg/bidiagonal.rs               | 14 +++++++-------
 src/linalg/cholesky.rs                 |  6 +++---
 src/linalg/eigen.rs                    | 10 +++++-----
 src/linalg/full_piv_lu.rs              | 10 +++++-----
 src/linalg/hessenberg.rs               | 10 +++++-----
 src/linalg/lu.rs                       | 10 +++++-----
 src/linalg/permutation_sequence.rs     |  6 +++---
 src/linalg/qr.rs                       | 10 +++++-----
 src/linalg/schur.rs                    |  6 +++---
 src/linalg/svd.rs                      | 14 +++++++-------
 src/linalg/symmetric_eigen.rs          | 10 +++++-----
 src/linalg/symmetric_tridiagonal.rs    | 10 +++++-----
 29 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/nalgebra-lapack/src/cholesky.rs b/nalgebra-lapack/src/cholesky.rs
index ba7830a5..c76a2676 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<N, D>,
-         MatrixN<N, D>: serde::Serialize"
+         MatrixN<N, D>: Serialize"
         )
     )
 )]
@@ -27,7 +27,7 @@ use lapack;
     serde(
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D>,
-         MatrixN<N, D>: serde::Deserialize<'de>"
+         MatrixN<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/nalgebra-lapack/src/eigen.rs b/nalgebra-lapack/src/eigen.rs
index e406f570..4fe74ce3 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<N, D, D> + Allocator<N, D>,
-         VectorN<N, D>: serde::Serialize,
-         MatrixN<N, D>: serde::Serialize"
+         VectorN<N, D>: Serialize,
+         MatrixN<N, D>: Serialize"
         )
     )
 )]
@@ -31,8 +31,8 @@ use lapack;
     serde(
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D, D> + Allocator<N, D>,
-         VectorN<N, D>: serde::Serialize,
-         MatrixN<N, D>: serde::Deserialize<'de>"
+         VectorN<N, D>: Serialize,
+         MatrixN<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/nalgebra-lapack/src/hessenberg.rs b/nalgebra-lapack/src/hessenberg.rs
index 6c1925f4..c42e349b 100644
--- a/nalgebra-lapack/src/hessenberg.rs
+++ b/nalgebra-lapack/src/hessenberg.rs
@@ -17,8 +17,8 @@ use lapack;
         bound(
             serialize = "DefaultAllocator: Allocator<N, D, D> +
                            Allocator<N, DimDiff<D, U1>>,
-         MatrixN<N, D>: serde::Serialize,
-         VectorN<N, DimDiff<D, U1>>: serde::Serialize"
+         MatrixN<N, D>: Serialize,
+         VectorN<N, DimDiff<D, U1>>: Serialize"
         )
     )
 )]
@@ -28,8 +28,8 @@ use lapack;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D, D> +
                            Allocator<N, DimDiff<D, U1>>,
-         MatrixN<N, D>: serde::Deserialize<'de>,
-         VectorN<N, DimDiff<D, U1>>: serde::Deserialize<'de>"
+         MatrixN<N, D>: Deserialize<'de>,
+         VectorN<N, DimDiff<D, U1>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/nalgebra-lapack/src/lu.rs b/nalgebra-lapack/src/lu.rs
index 4d3f1d94..4fb5a72f 100644
--- a/nalgebra-lapack/src/lu.rs
+++ b/nalgebra-lapack/src/lu.rs
@@ -24,8 +24,8 @@ use lapack;
         bound(
             serialize = "DefaultAllocator: Allocator<N, R, C> +
                            Allocator<i32, DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Serialize,
-         PermutationSequence<DimMinimum<R, C>>: serde::Serialize"
+         MatrixMN<N, R, C>: Serialize,
+         PermutationSequence<DimMinimum<R, C>>: Serialize"
         )
     )
 )]
@@ -35,8 +35,8 @@ use lapack;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, R, C> +
                            Allocator<i32, DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Deserialize<'de>,
-         PermutationSequence<DimMinimum<R, C>>: serde::Deserialize<'de>"
+         MatrixMN<N, R, C>: Deserialize<'de>,
+         PermutationSequence<DimMinimum<R, C>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/nalgebra-lapack/src/qr.rs b/nalgebra-lapack/src/qr.rs
index 128a2f03..775fd10b 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<N, R, C> +
                            Allocator<N, DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Serialize,
-         VectorN<N, DimMinimum<R, C>>: serde::Serialize"
+         MatrixMN<N, R, C>: Serialize,
+         VectorN<N, DimMinimum<R, C>>: Serialize"
         )
     )
 )]
@@ -31,8 +31,8 @@ use lapack;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, R, C> +
                            Allocator<N, DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Deserialize<'de>,
-         VectorN<N, DimMinimum<R, C>>: serde::Deserialize<'de>"
+         MatrixMN<N, R, C>: Deserialize<'de>,
+         VectorN<N, DimMinimum<R, C>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/nalgebra-lapack/src/schur.rs b/nalgebra-lapack/src/schur.rs
index eccc60d6..5f3bb4f0 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<N, D, D> + Allocator<N, D>,
-         VectorN<N, D>: serde::Serialize,
-         MatrixN<N, D>: serde::Serialize"
+         VectorN<N, D>: Serialize,
+         MatrixN<N, D>: Serialize"
         )
     )
 )]
@@ -31,8 +31,8 @@ use lapack;
     serde(
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D, D> + Allocator<N, D>,
-         VectorN<N, D>: serde::Serialize,
-         MatrixN<N, D>: serde::Deserialize<'de>"
+         VectorN<N, D>: Serialize,
+         MatrixN<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/nalgebra-lapack/src/svd.rs b/nalgebra-lapack/src/svd.rs
index ebfe1aae..347f5b9e 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<N, DimMinimum<R, C>> +
                            Allocator<N, R, R> +
                            Allocator<N, C, C>,
-         MatrixN<N, R>: serde::Serialize,
-         MatrixN<N, C>: serde::Serialize,
-         VectorN<N, DimMinimum<R, C>>: serde::Serialize"
+         MatrixN<N, R>: Serialize,
+         MatrixN<N, C>: Serialize,
+         VectorN<N, DimMinimum<R, C>>: Serialize"
         )
     )
 )]
@@ -33,9 +33,9 @@ use lapack;
             serialize = "DefaultAllocator: Allocator<N, DimMinimum<R, C>> +
                            Allocator<N, R, R> +
                            Allocator<N, C, C>,
-         MatrixN<N, R>: serde::Deserialize<'de>,
-         MatrixN<N, C>: serde::Deserialize<'de>,
-         VectorN<N, DimMinimum<R, C>>: serde::Deserialize<'de>"
+         MatrixN<N, R>: Deserialize<'de>,
+         MatrixN<N, C>: Deserialize<'de>,
+         VectorN<N, DimMinimum<R, C>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/nalgebra-lapack/src/symmetric_eigen.rs b/nalgebra-lapack/src/symmetric_eigen.rs
index bf041bbe..6ec7e1e9 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<N, D, D> +
                            Allocator<N, D>,
-         VectorN<N, D>: serde::Serialize,
-         MatrixN<N, D>: serde::Serialize"
+         VectorN<N, D>: Serialize,
+         MatrixN<N, D>: Serialize"
         )
     )
 )]
@@ -33,8 +33,8 @@ use lapack;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D, D> +
                            Allocator<N, D>,
-         VectorN<N, D>: serde::Deserialize<'de>,
-         MatrixN<N, D>: serde::Deserialize<'de>"
+         VectorN<N, D>: Deserialize<'de>,
+         MatrixN<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/geometry/isometry.rs b/src/geometry/isometry.rs
index 80283c54..3eebb93a 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<N, D>,
-                     Owned<N, D>: serde::Serialize"
+                     Owned<N, D>: 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<N, D>,
-                       Owned<N, D>: serde::Deserialize<'de>"
+                       Owned<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/geometry/orthographic.rs b/src/geometry/orthographic.rs
index 75eb92ff..728a1c1f 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<N: Real> PartialEq for Orthographic3<N> {
 }
 
 #[cfg(feature = "serde-serialize")]
-impl<N: Real + serde::Serialize> serde::Serialize for Orthographic3<N> {
+impl<N: Real + Serialize> Serialize for Orthographic3<N> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     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<N> {
+impl<'a, N: Real + Deserialize<'a>> Deserialize<'a> for Orthographic3<N> {
     fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
     where
-        Des: serde::Deserializer<'a>,
+        Des: Deserializer<'a>,
     {
         let matrix = Matrix4::<N>::deserialize(deserializer)?;
 
diff --git a/src/geometry/perspective.rs b/src/geometry/perspective.rs
index 933a7329..662d430b 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<N: Real> PartialEq for Perspective3<N> {
 }
 
 #[cfg(feature = "serde-serialize")]
-impl<N: Real + serde::Serialize> serde::Serialize for Perspective3<N> {
+impl<N: Real + Serialize> Serialize for Perspective3<N> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     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<N> {
+impl<'a, N: Real + Deserialize<'a>> Deserialize<'a> for Perspective3<N> {
     fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
     where
-        Des: serde::Deserializer<'a>,
+        Des: Deserializer<'a>,
     {
         let matrix = Matrix4::<N>::deserialize(deserializer)?;
 
diff --git a/src/geometry/point.rs b/src/geometry/point.rs
index 6cd0a3a3..6b3e4d2d 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<N: Scalar, D: DimName> serde::Serialize for Point<N, D>
+impl<N: Scalar, D: DimName> Serialize for Point<N, D>
 where
     DefaultAllocator: Allocator<N, D>,
-    <DefaultAllocator as Allocator<N, D>>::Buffer: serde::Serialize,
+    <DefaultAllocator as Allocator<N, D>>::Buffer: Serialize,
 {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     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<N, D>
+impl<'a, N: Scalar, D: DimName> Deserialize<'a> for Point<N, D>
 where
     DefaultAllocator: Allocator<N, D>,
-    <DefaultAllocator as Allocator<N, D>>::Buffer: serde::Deserialize<'a>,
+    <DefaultAllocator as Allocator<N, D>>::Buffer: Deserialize<'a>,
 {
     fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
     where
-        Des: serde::Deserializer<'a>,
+        Des: Deserializer<'a>,
     {
         let coords = VectorN::<N, D>::deserialize(deserializer)?;
 
diff --git a/src/geometry/quaternion.rs b/src/geometry/quaternion.rs
index d79997f0..47b62d6c 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<N: Real> Clone for Quaternion<N> {
 }
 
 #[cfg(feature = "serde-serialize")]
-impl<N: Real> serde::Serialize for Quaternion<N>
+impl<N: Real> Serialize for Quaternion<N>
 where
-    Owned<N, U4>: serde::Serialize,
+    Owned<N, U4>: Serialize,
 {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
-        S: serde::Serializer,
+        S: Serializer,
     {
         self.coords.serialize(serializer)
     }
 }
 
 #[cfg(feature = "serde-serialize")]
-impl<'a, N: Real> serde::Deserialize<'a> for Quaternion<N>
+impl<'a, N: Real> Deserialize<'a> for Quaternion<N>
 where
-    Owned<N, U4>: serde::Deserialize<'a>,
+    Owned<N, U4>: Deserialize<'a>,
 {
     fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
     where
-        Des: serde::Deserializer<'a>,
+        Des: Deserializer<'a>,
     {
         let coords = Vector4::<N>::deserialize(deserializer)?;
 
diff --git a/src/geometry/rotation.rs b/src/geometry/rotation.rs
index ffcb2f75..0ceaa73b 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<N: Scalar, D: DimName> serde::Serialize for Rotation<N, D>
+impl<N: Scalar, D: DimName> Serialize for Rotation<N, D>
 where
     DefaultAllocator: Allocator<N, D, D>,
-    Owned<N, D, D>: serde::Serialize,
+    Owned<N, D, D>: Serialize,
 {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     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<N, D>
+impl<'a, N: Scalar, D: DimName> Deserialize<'a> for Rotation<N, D>
 where
     DefaultAllocator: Allocator<N, D, D>,
-    Owned<N, D, D>: serde::Deserialize<'a>,
+    Owned<N, D, D>: Deserialize<'a>,
 {
     fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
     where
-        Des: serde::Deserializer<'a>,
+        Des: Deserializer<'a>,
     {
         let matrix = MatrixN::<N, D>::deserialize(deserializer)?;
 
diff --git a/src/geometry/similarity.rs b/src/geometry/similarity.rs
index e339d283..371be5f0 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<N, D>,
-                     Owned<N, D>: serde::Serialize"
+                     Owned<N, D>: 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<N, D>,
-                       Owned<N, D>: serde::Deserialize<'de>"
+                       Owned<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/geometry/transform.rs b/src/geometry/transform.rs
index 23ca5b29..7b393d21 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<N: Real, D: DimNameAdd<U1>, C: TCategory> serde::Serialize for Transform<N, D, C>
+impl<N: Real, D: DimNameAdd<U1>, C: TCategory> Serialize for Transform<N, D, C>
 where
     DefaultAllocator: Allocator<N, DimNameSum<D, U1>, DimNameSum<D, U1>>,
-    Owned<N, DimNameSum<D, U1>, DimNameSum<D, U1>>: serde::Serialize,
+    Owned<N, DimNameSum<D, U1>, DimNameSum<D, U1>>: Serialize,
 {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
-        S: serde::Serializer,
+        S: Serializer,
     {
         self.matrix.serialize(serializer)
     }
 }
 
 #[cfg(feature = "serde-serialize")]
-impl<'a, N: Real, D: DimNameAdd<U1>, C: TCategory> serde::Deserialize<'a> for Transform<N, D, C>
+impl<'a, N: Real, D: DimNameAdd<U1>, C: TCategory> Deserialize<'a> for Transform<N, D, C>
 where
     DefaultAllocator: Allocator<N, DimNameSum<D, U1>, DimNameSum<D, U1>>,
-    Owned<N, DimNameSum<D, U1>, DimNameSum<D, U1>>: serde::Deserialize<'a>,
+    Owned<N, DimNameSum<D, U1>, DimNameSum<D, U1>>: Deserialize<'a>,
 {
     fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
     where
-        Des: serde::Deserializer<'a>,
+        Des: Deserializer<'a>,
     {
         let matrix = MatrixN::<N, DimNameSum<D, U1>>::deserialize(deserializer)?;
 
diff --git a/src/geometry/translation.rs b/src/geometry/translation.rs
index 317e8177..ddf7651c 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<N: Scalar, D: DimName> serde::Serialize for Translation<N, D>
+impl<N: Scalar, D: DimName> Serialize for Translation<N, D>
 where
     DefaultAllocator: Allocator<N, D>,
-    Owned<N, D>: serde::Serialize,
+    Owned<N, D>: Serialize,
 {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     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<N, D>
+impl<'a, N: Scalar, D: DimName> Deserialize<'a> for Translation<N, D>
 where
     DefaultAllocator: Allocator<N, D>,
-    Owned<N, D>: serde::Deserialize<'a>,
+    Owned<N, D>: Deserialize<'a>,
 {
     fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
     where
-        Des: serde::Deserializer<'a>,
+        Des: Deserializer<'a>,
     {
         let matrix = VectorN::<N, D>::deserialize(deserializer)?;
 
diff --git a/src/linalg/bidiagonal.rs b/src/linalg/bidiagonal.rs
index 06286078..db340a9c 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<N, R, C>             +
                            Allocator<N, DimMinimum<R, C>> +
                            Allocator<N, DimDiff<DimMinimum<R, C>, U1>>,
-         MatrixMN<N, R, C>: serde::Serialize,
-         VectorN<N, DimMinimum<R, C>>: serde::Serialize,
-         VectorN<N, DimDiff<DimMinimum<R, C>, U1>>: serde::Serialize"
+         MatrixMN<N, R, C>: Serialize,
+         VectorN<N, DimMinimum<R, C>>: Serialize,
+         VectorN<N, DimDiff<DimMinimum<R, C>, U1>>: Serialize"
         )
     )
 )]
@@ -35,9 +35,9 @@ use linalg::householder;
          DefaultAllocator: Allocator<N, R, C>             +
                            Allocator<N, DimMinimum<R, C>> +
                            Allocator<N, DimDiff<DimMinimum<R, C>, U1>>,
-         MatrixMN<N, R, C>: serde::Deserialize<'de>,
-         VectorN<N, DimMinimum<R, C>>: serde::Deserialize<'de>,
-         VectorN<N, DimDiff<DimMinimum<R, C>, U1>>: serde::Deserialize<'de>"
+         MatrixMN<N, R, C>: Deserialize<'de>,
+         VectorN<N, DimMinimum<R, C>>: Deserialize<'de>,
+         VectorN<N, DimDiff<DimMinimum<R, C>, U1>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/cholesky.rs b/src/linalg/cholesky.rs
index a77e6b2e..d385ff0b 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<N, D>,
-         MatrixN<N, D>: serde::Serialize"
+         MatrixN<N, D>: Serialize"
         )
     )
 )]
@@ -25,7 +25,7 @@ use storage::{Storage, StorageMut};
     serde(
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D>,
-         MatrixN<N, D>: serde::Deserialize<'de>"
+         MatrixN<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/eigen.rs b/src/linalg/eigen.rs
index e45d5948..c9fe16e6 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<N, D>,
-         VectorN<N, D>: serde::Serialize,
-         MatrixN<N, D>: serde::Serialize"
+         VectorN<N, D>: Serialize,
+         MatrixN<N, D>: Serialize"
         )
     )
 )]
@@ -34,8 +34,8 @@ use linalg::RealSchur;
     serde(
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D>,
-         VectorN<N, D>: serde::Serialize,
-         MatrixN<N, D>: serde::Deserialize<'de>"
+         VectorN<N, D>: Serialize,
+         MatrixN<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/full_piv_lu.rs b/src/linalg/full_piv_lu.rs
index 366c27bd..695bc0ca 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<N, R, C> +
                            Allocator<(usize, usize), DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Serialize,
-         PermutationSequence<DimMinimum<R, C>>: serde::Serialize"
+         MatrixMN<N, R, C>: Serialize,
+         PermutationSequence<DimMinimum<R, C>>: Serialize"
         )
     )
 )]
@@ -30,8 +30,8 @@ use linalg::PermutationSequence;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, R, C> +
                            Allocator<(usize, usize), DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Deserialize<'de>,
-         PermutationSequence<DimMinimum<R, C>>: serde::Deserialize<'de>"
+         MatrixMN<N, R, C>: Deserialize<'de>,
+         PermutationSequence<DimMinimum<R, C>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/hessenberg.rs b/src/linalg/hessenberg.rs
index 405adb5b..a831cc2e 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<N, D, D> +
                            Allocator<N, DimDiff<D, U1>>,
-         MatrixN<N, D>: serde::Serialize,
-         VectorN<N, DimDiff<D, U1>>: serde::Serialize"
+         MatrixN<N, D>: Serialize,
+         VectorN<N, DimDiff<D, U1>>: Serialize"
         )
     )
 )]
@@ -29,8 +29,8 @@ use linalg::householder;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D, D> +
                            Allocator<N, DimDiff<D, U1>>,
-         MatrixN<N, D>: serde::Deserialize<'de>,
-         VectorN<N, DimDiff<D, U1>>: serde::Deserialize<'de>"
+         MatrixN<N, D>: Deserialize<'de>,
+         VectorN<N, DimDiff<D, U1>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/lu.rs b/src/linalg/lu.rs
index 0925b82b..7707242b 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<N, R, C> +
                            Allocator<(usize, usize), DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Serialize,
-         PermutationSequence<DimMinimum<R, C>>: serde::Serialize"
+         MatrixMN<N, R, C>: Serialize,
+         PermutationSequence<DimMinimum<R, C>>: Serialize"
         )
     )
 )]
@@ -30,8 +30,8 @@ use linalg::PermutationSequence;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, R, C> +
                            Allocator<(usize, usize), DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Deserialize<'de>,
-         PermutationSequence<DimMinimum<R, C>>: serde::Deserialize<'de>"
+         MatrixMN<N, R, C>: Deserialize<'de>,
+         PermutationSequence<DimMinimum<R, C>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/permutation_sequence.rs b/src/linalg/permutation_sequence.rs
index 3d3fc5bd..b6818751 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 c7892a9b..f2092de7 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<N, R, C> +
                            Allocator<N, DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Serialize,
-         VectorN<N, DimMinimum<R, C>>: serde::Serialize")))]
+         MatrixMN<N, R, C>: Serialize,
+         VectorN<N, DimMinimum<R, C>>: Serialize")))]
 #[cfg_attr(feature = "serde-serialize",
            serde(bound(deserialize = "DefaultAllocator: Allocator<N, R, C> +
                            Allocator<N, DimMinimum<R, C>>,
-         MatrixMN<N, R, C>: serde::Deserialize<'de>,
-         VectorN<N, DimMinimum<R, C>>: serde::Deserialize<'de>")))]
+         MatrixMN<N, R, C>: Deserialize<'de>,
+         VectorN<N, DimMinimum<R, C>>: Deserialize<'de>")))]
 #[derive(Clone, Debug)]
 pub struct QR<N: Real, R: DimMin<C>, C: Dim>
 where
diff --git a/src/linalg/schur.rs b/src/linalg/schur.rs
index ec2028c7..25a73008 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<N, D, D>,
-         MatrixN<N, D>: serde::Serialize"
+         MatrixN<N, D>: Serialize"
         )
     )
 )]
@@ -31,7 +31,7 @@ use linalg::Hessenberg;
     serde(
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D, D>,
-         MatrixN<N, D>: serde::Deserialize<'de>"
+         MatrixN<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/svd.rs b/src/linalg/svd.rs
index 2fe1f985..87baddc9 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<N, DimMinimum<R, C>>    +
                            Allocator<N, DimMinimum<R, C>, C> +
                            Allocator<N, R, DimMinimum<R, C>>,
-         MatrixMN<N, R, DimMinimum<R, C>>: serde::Serialize,
-         MatrixMN<N, DimMinimum<R, C>, C>: serde::Serialize,
-         VectorN<N, DimMinimum<R, C>>: serde::Serialize"
+         MatrixMN<N, R, DimMinimum<R, C>>: Serialize,
+         MatrixMN<N, DimMinimum<R, C>, C>: Serialize,
+         VectorN<N, DimMinimum<R, C>>: Serialize"
         )
     )
 )]
@@ -40,9 +40,9 @@ use linalg::Bidiagonal;
                            Allocator<N, DimMinimum<R, C>>    +
                            Allocator<N, DimMinimum<R, C>, C> +
                            Allocator<N, R, DimMinimum<R, C>>,
-         MatrixMN<N, R, DimMinimum<R, C>>: serde::Deserialize<'de>,
-         MatrixMN<N, DimMinimum<R, C>, C>: serde::Deserialize<'de>,
-         VectorN<N, DimMinimum<R, C>>: serde::Deserialize<'de>"
+         MatrixMN<N, R, DimMinimum<R, C>>: Deserialize<'de>,
+         MatrixMN<N, DimMinimum<R, C>, C>: Deserialize<'de>,
+         VectorN<N, DimMinimum<R, C>>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/symmetric_eigen.rs b/src/linalg/symmetric_eigen.rs
index 3ccd0e88..d7b2fd23 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<N, D, D> +
                            Allocator<N, D>,
-         VectorN<N, D>: serde::Serialize,
-         MatrixN<N, D>: serde::Serialize"
+         VectorN<N, D>: Serialize,
+         MatrixN<N, D>: Serialize"
         )
     )
 )]
@@ -33,8 +33,8 @@ use linalg::SymmetricTridiagonal;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D, D> +
                            Allocator<N, D>,
-         VectorN<N, D>: serde::Deserialize<'de>,
-         MatrixN<N, D>: serde::Deserialize<'de>"
+         VectorN<N, D>: Deserialize<'de>,
+         MatrixN<N, D>: Deserialize<'de>"
         )
     )
 )]
diff --git a/src/linalg/symmetric_tridiagonal.rs b/src/linalg/symmetric_tridiagonal.rs
index 16c7ba47..a1af96d0 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<N, D, D> +
                            Allocator<N, DimDiff<D, U1>>,
-         MatrixN<N, D>: serde::Serialize,
-         VectorN<N, DimDiff<D, U1>>: serde::Serialize"
+         MatrixN<N, D>: Serialize,
+         VectorN<N, DimDiff<D, U1>>: Serialize"
         )
     )
 )]
@@ -28,8 +28,8 @@ use linalg::householder;
         bound(
             deserialize = "DefaultAllocator: Allocator<N, D, D> +
                            Allocator<N, DimDiff<D, U1>>,
-         MatrixN<N, D>: serde::Deserialize<'de>,
-         VectorN<N, DimDiff<D, U1>>: serde::Deserialize<'de>"
+         MatrixN<N, D>: Deserialize<'de>,
+         VectorN<N, DimDiff<D, U1>>: Deserialize<'de>"
         )
     )
 )]