Skip to content

Commit 533384a

Browse files
sebcrozetsebcrozet
committed
Fix compilation errors when the serde-serialize feature is enabled.
Fix #369.
1 parent f9ea9f0 commit 533384a

29 files changed

+153
-153
lines changed

‎nalgebra-lapack/src/cholesky.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[cfg(feature = "serde-serialize")]
2-
use serde;
2+
use serde::{Serialize, Deserialize};
33

44
use num::Zero;
55
use num_complex::Complex;
@@ -18,7 +18,7 @@ use lapack;
1818
serde(
1919
bound(
2020
serialize = "DefaultAllocator: Allocator<N, D>,
21-
MatrixN<N, D>: serde::Serialize"
21+
MatrixN<N, D>: Serialize"
2222
)
2323
)
2424
)]
@@ -27,7 +27,7 @@ use lapack;
2727
serde(
2828
bound(
2929
deserialize = "DefaultAllocator: Allocator<N, D>,
30-
MatrixN<N, D>: serde::Deserialize<'de>"
30+
MatrixN<N, D>: Deserialize<'de>"
3131
)
3232
)
3333
)]

‎nalgebra-lapack/src/eigen.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[cfg(feature = "serde-serialize")]
2-
use serde;
2+
use serde::{Serialize, Deserialize};
33

44
use num::Zero;
55
use num_complex::Complex;
@@ -21,8 +21,8 @@ use lapack;
2121
serde(
2222
bound(
2323
serialize = "DefaultAllocator: Allocator<N, D, D> + Allocator<N, D>,
24-
VectorN<N, D>: serde::Serialize,
25-
MatrixN<N, D>: serde::Serialize"
24+
VectorN<N, D>: Serialize,
25+
MatrixN<N, D>: Serialize"
2626
)
2727
)
2828
)]
@@ -31,8 +31,8 @@ use lapack;
3131
serde(
3232
bound(
3333
deserialize = "DefaultAllocator: Allocator<N, D, D> + Allocator<N, D>,
34-
VectorN<N, D>: serde::Serialize,
35-
MatrixN<N, D>: serde::Deserialize<'de>"
34+
VectorN<N, D>: Serialize,
35+
MatrixN<N, D>: Deserialize<'de>"
3636
)
3737
)
3838
)]

‎nalgebra-lapack/src/hessenberg.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use lapack;
1717
bound(
1818
serialize = "DefaultAllocator: Allocator<N, D, D> +
1919
Allocator<N, DimDiff<D, U1>>,
20-
MatrixN<N, D>: serde::Serialize,
21-
VectorN<N, DimDiff<D, U1>>: serde::Serialize"
20+
MatrixN<N, D>: Serialize,
21+
VectorN<N, DimDiff<D, U1>>: Serialize"
2222
)
2323
)
2424
)]
@@ -28,8 +28,8 @@ use lapack;
2828
bound(
2929
deserialize = "DefaultAllocator: Allocator<N, D, D> +
3030
Allocator<N, DimDiff<D, U1>>,
31-
MatrixN<N, D>: serde::Deserialize<'de>,
32-
VectorN<N, DimDiff<D, U1>>: serde::Deserialize<'de>"
31+
MatrixN<N, D>: Deserialize<'de>,
32+
VectorN<N, DimDiff<D, U1>>: Deserialize<'de>"
3333
)
3434
)
3535
)]

‎nalgebra-lapack/src/lu.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ use lapack;
2424
bound(
2525
serialize = "DefaultAllocator: Allocator<N, R, C> +
2626
Allocator<i32, DimMinimum<R, C>>,
27-
MatrixMN<N, R, C>: serde::Serialize,
28-
PermutationSequence<DimMinimum<R, C>>: serde::Serialize"
27+
MatrixMN<N, R, C>: Serialize,
28+
PermutationSequence<DimMinimum<R, C>>: Serialize"
2929
)
3030
)
3131
)]
@@ -35,8 +35,8 @@ use lapack;
3535
bound(
3636
deserialize = "DefaultAllocator: Allocator<N, R, C> +
3737
Allocator<i32, DimMinimum<R, C>>,
38-
MatrixMN<N, R, C>: serde::Deserialize<'de>,
39-
PermutationSequence<DimMinimum<R, C>>: serde::Deserialize<'de>"
38+
MatrixMN<N, R, C>: Deserialize<'de>,
39+
PermutationSequence<DimMinimum<R, C>>: Deserialize<'de>"
4040
)
4141
)
4242
)]

‎nalgebra-lapack/src/qr.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[cfg(feature = "serde-serialize")]
2-
use serde;
2+
use serde::{Serialize, Deserialize};
33

44
use num::Zero;
55
use num_complex::Complex;
@@ -20,8 +20,8 @@ use lapack;
2020
bound(
2121
serialize = "DefaultAllocator: Allocator<N, R, C> +
2222
Allocator<N, DimMinimum<R, C>>,
23-
MatrixMN<N, R, C>: serde::Serialize,
24-
VectorN<N, DimMinimum<R, C>>: serde::Serialize"
23+
MatrixMN<N, R, C>: Serialize,
24+
VectorN<N, DimMinimum<R, C>>: Serialize"
2525
)
2626
)
2727
)]
@@ -31,8 +31,8 @@ use lapack;
3131
bound(
3232
deserialize = "DefaultAllocator: Allocator<N, R, C> +
3333
Allocator<N, DimMinimum<R, C>>,
34-
MatrixMN<N, R, C>: serde::Deserialize<'de>,
35-
VectorN<N, DimMinimum<R, C>>: serde::Deserialize<'de>"
34+
MatrixMN<N, R, C>: Deserialize<'de>,
35+
VectorN<N, DimMinimum<R, C>>: Deserialize<'de>"
3636
)
3737
)
3838
)]

‎nalgebra-lapack/src/schur.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[cfg(feature = "serde-serialize")]
2-
use serde;
2+
use serde::{Serialize, Deserialize};
33

44
use num::Zero;
55
use num_complex::Complex;
@@ -21,8 +21,8 @@ use lapack;
2121
serde(
2222
bound(
2323
serialize = "DefaultAllocator: Allocator<N, D, D> + Allocator<N, D>,
24-
VectorN<N, D>: serde::Serialize,
25-
MatrixN<N, D>: serde::Serialize"
24+
VectorN<N, D>: Serialize,
25+
MatrixN<N, D>: Serialize"
2626
)
2727
)
2828
)]
@@ -31,8 +31,8 @@ use lapack;
3131
serde(
3232
bound(
3333
deserialize = "DefaultAllocator: Allocator<N, D, D> + Allocator<N, D>,
34-
VectorN<N, D>: serde::Serialize,
35-
MatrixN<N, D>: serde::Deserialize<'de>"
34+
VectorN<N, D>: Serialize,
35+
MatrixN<N, D>: Deserialize<'de>"
3636
)
3737
)
3838
)]

‎nalgebra-lapack/src/svd.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[cfg(feature = "serde-serialize")]
2-
use serde;
2+
use serde::{Serialize, Deserialize};
33

44
use num::Signed;
55
use std::cmp;
@@ -20,9 +20,9 @@ use lapack;
2020
serialize = "DefaultAllocator: Allocator<N, DimMinimum<R, C>> +
2121
Allocator<N, R, R> +
2222
Allocator<N, C, C>,
23-
MatrixN<N, R>: serde::Serialize,
24-
MatrixN<N, C>: serde::Serialize,
25-
VectorN<N, DimMinimum<R, C>>: serde::Serialize"
23+
MatrixN<N, R>: Serialize,
24+
MatrixN<N, C>: Serialize,
25+
VectorN<N, DimMinimum<R, C>>: Serialize"
2626
)
2727
)
2828
)]
@@ -33,9 +33,9 @@ use lapack;
3333
serialize = "DefaultAllocator: Allocator<N, DimMinimum<R, C>> +
3434
Allocator<N, R, R> +
3535
Allocator<N, C, C>,
36-
MatrixN<N, R>: serde::Deserialize<'de>,
37-
MatrixN<N, C>: serde::Deserialize<'de>,
38-
VectorN<N, DimMinimum<R, C>>: serde::Deserialize<'de>"
36+
MatrixN<N, R>: Deserialize<'de>,
37+
MatrixN<N, C>: Deserialize<'de>,
38+
VectorN<N, DimMinimum<R, C>>: Deserialize<'de>"
3939
)
4040
)
4141
)]

‎nalgebra-lapack/src/symmetric_eigen.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[cfg(feature = "serde-serialize")]
2-
use serde;
2+
use serde::{Serialize, Deserialize};
33

44
use num::Zero;
55
use std::ops::MulAssign;
@@ -22,8 +22,8 @@ use lapack;
2222
bound(
2323
serialize = "DefaultAllocator: Allocator<N, D, D> +
2424
Allocator<N, D>,
25-
VectorN<N, D>: serde::Serialize,
26-
MatrixN<N, D>: serde::Serialize"
25+
VectorN<N, D>: Serialize,
26+
MatrixN<N, D>: Serialize"
2727
)
2828
)
2929
)]
@@ -33,8 +33,8 @@ use lapack;
3333
bound(
3434
deserialize = "DefaultAllocator: Allocator<N, D, D> +
3535
Allocator<N, D>,
36-
VectorN<N, D>: serde::Deserialize<'de>,
37-
MatrixN<N, D>: serde::Deserialize<'de>"
36+
VectorN<N, D>: Deserialize<'de>,
37+
MatrixN<N, D>: Deserialize<'de>"
3838
)
3939
)
4040
)]

‎src/geometry/isometry.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::io::{Result as IOResult, Write};
66
use std::marker::PhantomData;
77

88
#[cfg(feature = "serde-serialize")]
9-
use serde;
9+
use serde::{Serialize, Deserialize};
1010

1111
#[cfg(feature = "abomonation-serialize")]
1212
use abomonation::Abomonation;
@@ -28,19 +28,19 @@ use geometry::{Point, Translation};
2828
feature = "serde-serialize",
2929
serde(
3030
bound(
31-
serialize = "R: serde::Serialize,
31+
serialize = "R: Serialize,
3232
DefaultAllocator: Allocator<N, D>,
33-
Owned<N, D>: serde::Serialize"
33+
Owned<N, D>: Serialize"
3434
)
3535
)
3636
)]
3737
#[cfg_attr(
3838
feature = "serde-serialize",
3939
serde(
4040
bound(
41-
deserialize = "R: serde::Deserialize<'de>,
41+
deserialize = "R: Deserialize<'de>,
4242
DefaultAllocator: Allocator<N, D>,
43-
Owned<N, D>: serde::Deserialize<'de>"
43+
Owned<N, D>: Deserialize<'de>"
4444
)
4545
)
4646
)]

‎src/geometry/orthographic.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use quickcheck::{Arbitrary, Gen};
33
use rand::distributions::{Distribution, Standard};
44
use rand::Rng;
55
#[cfg(feature = "serde-serialize")]
6-
use serde;
6+
use serde::{Serialize, Deserialize, Serializer, Deserializer};
77
use std::fmt;
88

99
use alga::general::Real;
@@ -43,20 +43,20 @@ impl<N: Real> PartialEq for Orthographic3<N> {
4343
}
4444

4545
#[cfg(feature = "serde-serialize")]
46-
impl<N: Real + serde::Serialize> serde::Serialize for Orthographic3<N> {
46+
impl<N: Real + Serialize> Serialize for Orthographic3<N> {
4747
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
4848
where
49-
S: serde::Serializer,
49+
S: Serializer,
5050
{
5151
self.matrix.serialize(serializer)
5252
}
5353
}
5454

5555
#[cfg(feature = "serde-serialize")]
56-
impl<'a, N: Real + serde::Deserialize<'a>> serde::Deserialize<'a> for Orthographic3<N> {
56+
impl<'a, N: Real + Deserialize<'a>> Deserialize<'a> for Orthographic3<N> {
5757
fn deserialize<Des>(deserializer: Des) -> Result<Self, Des::Error>
5858
where
59-
Des: serde::Deserializer<'a>,
59+
Des: Deserializer<'a>,
6060
{
6161
let matrix = Matrix4::<N>::deserialize(deserializer)?;
6262

0 commit comments

Comments
 (0)