Fix serde feature warning

rustgd · Sep 19, 2021 · bb86282 · bb86282
1 parent 7c257f8
commit bb86282
Show file tree

Hide file tree

Showing 25 changed files with 36 additions and 36 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,16 +31,16 @@ keywords = ["gamedev", "cgmath", "collision"]
 [lib]
 name = "collision"
 
+[features]
+serde = ["serde_crate", "cgmath/serde", "num/serde"]
+
 [dependencies]
 rand = "0.8.4"
 cgmath = "0.18.0"
-serde = { version = "1.0.126", optional = true, features = ["derive"] }
+serde_crate = { version = "1.0.126", package="serde", optional = true, features = ["derive"] }
 bit-set = "0.5.2"
 smallvec = "1.6.1"
-
-[target.'cfg(feature="serde")'.dependencies]
-cgmath = { version = "0.18.0", features = ["serde"] }
-num = { version = "0.4.0", features = ["serde"] }
+num = "0.4.0"
 
 [dev-dependencies]
 genmesh = "0.5"
diff --git a/src/contact.rs b/src/contact.rs
@@ -8,7 +8,7 @@ use cgmath::prelude::*;
 /// found contact will have this returned on it, detailing what data is relevant in the
 /// [`Contact`](struct.Contact.html).
 #[derive(Debug, PartialEq, Copy, Clone, PartialOrd)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub enum CollisionStrategy {
     /// Compute full contact manifold for the collision
     FullResolution,

diff --git a/src/frustum.rs b/src/frustum.rs
@@ -9,7 +9,7 @@ use cgmath::{Ortho, Perspective, PerspectiveFov};
 
 /// View frustum, used for frustum culling
 #[derive(Copy, Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Frustum<S: BaseFloat> {
     /// Left plane
     pub left: Plane<S>,
@@ -99,7 +99,7 @@ impl<S: BaseFloat> Frustum<S> {
 
 /// View frustum corner points
 #[derive(Copy, Clone, PartialEq, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct FrustumPoints<S> {
     /// Near top left point
     pub near_top_left: Point3<S>,

diff --git a/src/lib.rs b/src/lib.rs
@@ -31,7 +31,7 @@
 
 #[cfg(feature = "serde")]
 #[macro_use]
-extern crate serde;
+extern crate serde_crate;
 
 // Re-exports
 

diff --git a/src/line.rs b/src/line.rs
@@ -12,7 +12,7 @@ use crate::Ray2;
 
 /// A generic directed line segment from `origin` to `dest`.
 #[derive(Copy, Clone, PartialEq, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Line<S, V, P> {
     /// Origin of the line
     pub origin: P,

diff --git a/src/plane.rs b/src/plane.rs
@@ -24,7 +24,7 @@ use crate::Ray3;
 /// alternative, `A*x + B*y + C*z + D = 0`, because it tends to avoid
 /// superfluous negations (see _Real Time Collision Detection_, p. 55).
 #[derive(Copy, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Plane<S> {
     /// Plane normal
     pub n: Vector3<S>,

diff --git a/src/primitive/capsule.rs b/src/primitive/capsule.rs
@@ -9,7 +9,7 @@ use crate::{Aabb3, Ray3};
 /// Capsule primitive
 /// Capsule body is aligned with the Y axis, with local origin in the center of the capsule.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Capsule<S> {
     half_height: S,
     radius: S,

diff --git a/src/primitive/circle.rs b/src/primitive/circle.rs
@@ -8,7 +8,7 @@ use crate::{Aabb2, Ray2};
 
 /// Circle primitive
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Circle<S> {
     /// Radius of the circle
     pub radius: S,

diff --git a/src/primitive/cuboid.rs b/src/primitive/cuboid.rs
@@ -10,7 +10,7 @@ use crate::{Aabb3, Ray3};
 ///
 /// Have a cached set of corner points to speed up computation.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Cuboid<S> {
     /// Dimensions of the box
     dim: Vector3<S>,
@@ -132,7 +132,7 @@ where
 ///
 /// Have a cached set of corner points to speed up computation.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Cube<S> {
     cuboid: Cuboid<S>,
 }

diff --git a/src/primitive/cylinder.rs b/src/primitive/cylinder.rs
@@ -9,7 +9,7 @@ use crate::{Aabb3, Ray3};
 /// Cylinder primitive
 /// Cylinder body is aligned with the Y axis, with local origin in the center of the cylinders.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Cylinder<S> {
     half_height: S,
     radius: S,

diff --git a/src/primitive/particle.rs b/src/primitive/particle.rs
@@ -17,7 +17,7 @@ use crate::Ray;
 /// These intersection tests can be used with any primitive that has `Ray` intersection tests
 /// implemented.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Particle<P> {
     m: marker::PhantomData<P>,
 }

diff --git a/src/primitive/polygon.rs b/src/primitive/polygon.rs
@@ -12,7 +12,7 @@ use crate::{Aabb2, Line2, Ray2};
 /// Can contain any number of vertices, but a high number of vertices will
 /// affect performance of course. Vertices need to be in CCW order.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct ConvexPolygon<S> {
     /// Vertices of the convex polygon.
     pub vertices: Vec<Point2<S>>,

diff --git a/src/primitive/polyhedron.rs b/src/primitive/polyhedron.rs
@@ -11,22 +11,22 @@ use crate::volume::Sphere;
 use crate::{Aabb3, Plane, Ray3};
 
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 enum PolyhedronMode {
     VertexOnly,
     HalfEdge,
 }
 
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 struct Vertex<S> {
     position: Point3<S>,
     edge: usize,
     ready: bool,
 }
 
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 struct Edge {
     target_vertex: usize,
     left_face: usize,
@@ -37,7 +37,7 @@ struct Edge {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 struct Face<S>
 where
     S: BaseFloat,
@@ -59,7 +59,7 @@ where
 ///
 ///
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct ConvexPolyhedron<S>
 where
     S: BaseFloat,

diff --git a/src/primitive/primitive2.rs b/src/primitive/primitive2.rs
@@ -10,7 +10,7 @@ use crate::{Aabb2, Line2, Ray2};
 /// Wrapper enum for 2D primitives, that also implements the `Primitive` trait, making it easier
 /// to use many different primitives in algorithms.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub enum Primitive2<S> {
     /// Particle
     Particle(Particle2<S>),

diff --git a/src/primitive/primitive3.rs b/src/primitive/primitive3.rs
@@ -12,7 +12,7 @@ use crate::{Aabb3, Ray3};
 /// Wrapper enum for 3D primitives, that also implements the `Primitive` trait, making it easier
 /// to use many different primitives in algorithms.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub enum Primitive3<S>
 where
     S: BaseFloat,

diff --git a/src/primitive/quad.rs b/src/primitive/quad.rs
@@ -11,7 +11,7 @@ use crate::{Aabb3, Ray3, Sphere};
 ///
 /// Have a cached set of corner points to speed up computation.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Quad<S> {
     /// Dimensions of the rectangle
     dim: Vector2<S>,

diff --git a/src/primitive/rectangle.rs b/src/primitive/rectangle.rs
@@ -11,7 +11,7 @@ use crate::{Aabb2, Ray2};
 ///
 /// Have a cached set of corner points to speed up computation.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Rectangle<S> {
     /// Dimensions of the rectangle
     dim: Vector2<S>,
@@ -110,7 +110,7 @@ where
 ///
 /// Have a cached set of corner points to speed up computation.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Square<S> {
     rectangle: Rectangle<S>,
 }

diff --git a/src/primitive/sphere.rs b/src/primitive/sphere.rs
@@ -6,7 +6,7 @@ use crate::{Aabb3, Ray3};
 
 /// Sphere primitive
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Sphere<S> {
     /// Radius of the sphere
     pub radius: S,

diff --git a/src/ray.rs b/src/ray.rs
@@ -12,7 +12,7 @@ use crate::traits::{Continuous, ContinuousTransformed, Discrete, DiscreteTransfo
 /// A generic ray starting at `origin` and extending infinitely in
 /// `direction`.
 #[derive(Copy, Clone, PartialEq, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Ray<S, P, V> {
     /// Ray origin
     pub origin: P,

diff --git a/src/volume/aabb/aabb2.rs b/src/volume/aabb/aabb2.rs
@@ -12,7 +12,7 @@ use crate::{Line2, Ray2};
 
 /// A two-dimensional AABB, aka a rectangle.
 #[derive(Copy, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Aabb2<S> {
     /// Minimum point of the AABB
     pub min: Point2<S>,

diff --git a/src/volume/aabb/aabb3.rs b/src/volume/aabb/aabb3.rs
@@ -12,7 +12,7 @@ use crate::{Line3, Plane, Ray3, Sphere};
 
 /// A three-dimensional AABB, aka a rectangular prism.
 #[derive(Copy, Clone, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Aabb3<S> {
     /// Minimum point of the AABB
     pub min: Point3<S>,

diff --git a/src/volume/cylinder.rs b/src/volume/cylinder.rs
@@ -5,7 +5,7 @@ use cgmath::Vector3;
 
 /// Bounding cylinder
 #[derive(Copy, Clone, PartialEq, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Cylinder<S> {
     /// Center point
     pub center: Point3<S>,

diff --git a/src/volume/obb.rs b/src/volume/obb.rs
@@ -8,7 +8,7 @@ use cgmath::{Vector2, Vector3};
 /// Generic object bounding box, centered on `center`, aligned with `axis`,
 /// and with size `extents`.
 #[derive(Copy, Clone, PartialEq, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Obb<S, V, P> {
     /// OBB center point in world space
     pub center: P,

diff --git a/src/volume/sphere.rs b/src/volume/sphere.rs
@@ -8,7 +8,7 @@ use crate::{Aabb3, Line3, Plane, Ray3};
 
 /// Bounding sphere.
 #[derive(Copy, Clone, PartialEq, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
 pub struct Sphere<S: BaseFloat> {
     /// Center point of the sphere in world space
     pub center: Point3<S>,

diff --git a/tests/serde.rs b/tests/serde.rs
@@ -1,7 +1,7 @@
 #![cfg(feature = "serde")]
 
 use cgmath::Point1;
-use serde::Serialize;
+use serde_crate::Serialize;
 
 fn has_serialize<S: Serialize>() -> bool {
     true