Remove feature gate for serde (SpectralSequences#141)

* Remove `serde_json` gates * Adjust `web_ext`
JoeyBF · Nov 27, 2023 · aa6b8fe · aa6b8fe
1 parent 8075e0a
commit aa6b8fe
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 55 deletions.
diff --git a/ext/Cargo.toml b/ext/Cargo.toml
@@ -13,9 +13,7 @@ license = "(MIT OR Apache-2.0)"
 resolver = "2"
 
 [dependencies]
-algebra = { path = "crates/algebra", default-features = false, features = [
-    "json",
-] }
+algebra = { path = "crates/algebra", default-features = false }
 bivec = { path = "crates/bivec" }
 chart = { path = "crates/chart" }
 fp = { path = "crates/fp", default-features = false }

diff --git a/ext/crates/algebra/Cargo.toml b/ext/crates/algebra/Cargo.toml
@@ -24,19 +24,18 @@ itertools = { version = "0.10.0", default-features = false, features = [
 ] }
 nom = { version = "7.0.0", default-features = false, features = ["alloc"] }
 rustc-hash = "1.1.0"
-serde = { version = "1.0.0", features = ["derive"], optional = true }
-serde_json = { version = "1.0.0", optional = true }
+serde = { version = "1.0.0", features = ["derive"] }
+serde_json = "1.0.0"
 
 [dev-dependencies]
 bencher = "0.1.5"
 expect-test = "1.1.0"
 rstest = "0.17.0"
 
 [features]
-default = ["odd-primes", "json"]
+default = ["odd-primes"]
 cache-multiplication = []
 concurrent = ["fp/concurrent", "maybe-rayon/concurrent"]
-json = ["serde", "serde_json", "bivec/json", "fp/json"]
 odd-primes = ["fp/odd-primes"]
 
 [[bench]]

diff --git a/ext/crates/algebra/src/algebra/milnor_algebra.rs b/ext/crates/algebra/src/algebra/milnor_algebra.rs
@@ -8,7 +8,6 @@ use fp::prime::{factor_pk, integer_power, Binomial, BitflagIterator, ValidPrime}
 use fp::vector::{FpVector, Slice, SliceMut};
 use once::OnceVec;
 
-#[cfg(feature = "json")]
 use {serde::Deserialize, serde::Serialize};
 
 // This is here so that the Python bindings can use modules defined for AdemAlgebraT with their own algebra enum.
@@ -24,22 +23,20 @@ impl MilnorAlgebraT for MilnorAlgebra {
     }
 }
 
-#[cfg(feature = "json")]
 fn q_part_default() -> u32 {
     !0
 }
 
-#[cfg_attr(feature = "json", derive(Deserialize, Serialize))]
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct MilnorProfile {
     /// If `true`, unspecified p_part entries will be 0. Otherwise they will be infinity.
     pub truncated: bool,
     /// A bitmask indicating which of the Q_k we want to include (1 = include). Defaults to `!0`.
     /// This is only relevant at odd primes.
-    #[cfg_attr(feature = "json", serde(default = "q_part_default"))]
+    #[serde(default = "q_part_default")]
     pub q_part: u32,
     /// The profile function for the Q part.
-    #[cfg_attr(feature = "json", serde(default))]
+    #[serde(default)]
     pub p_part: PPart,
 }
 

diff --git a/ext/crates/algebra/src/algebra/steenrod_algebra.rs b/ext/crates/algebra/src/algebra/steenrod_algebra.rs
@@ -9,7 +9,6 @@ use anyhow::anyhow;
 
 use std::io::{Read, Write};
 
-#[cfg(feature = "json")]
 use {serde::Deserialize, serde_json::Value};
 
 // This is here so that the Python bindings can use modules defined aor SteenrodAlgebraT with their own algebra enum.
@@ -144,15 +143,13 @@ impl Bialgebra for SteenrodAlgebra {
     }
 }
 
-#[cfg(feature = "json")]
 #[derive(Deserialize, Debug)]
 struct AlgebraSpec {
     p: ValidPrime,
     algebra: Option<Vec<String>>,
     profile: Option<crate::algebra::milnor_algebra::MilnorProfile>,
 }
 
-#[cfg(feature = "json")]
 impl SteenrodAlgebra {
     pub fn from_json(
         json: &Value,

diff --git a/ext/crates/algebra/src/lib.rs b/ext/crates/algebra/src/lib.rs
@@ -13,7 +13,6 @@ mod algebra;
 
 pub use crate::algebra::*;
 
-#[cfg(feature = "json")]
 pub(crate) fn module_gens_from_json(
     gens: &serde_json::Value,
 ) -> (

diff --git a/ext/crates/algebra/src/module/finite_dimensional_module.rs b/ext/crates/algebra/src/module/finite_dimensional_module.rs
@@ -6,7 +6,6 @@ use fp::vector::{FpVector, SliceMut};
 use std::fmt::Write as _;
 use std::sync::Arc;
 
-#[cfg(feature = "json")]
 use {
     crate::algebra::GeneratedAlgebra,
     crate::module::ModuleFailedRelationError,
@@ -450,7 +449,6 @@ impl<M: Module> From<&M> for FiniteDimensionalModule<M::Algebra> {
     }
 }
 
-#[cfg(feature = "json")]
 impl<A: GeneratedAlgebra> FiniteDimensionalModule<A> {
     pub fn from_json(algebra: Arc<A>, json: &Value) -> anyhow::Result<Self> {
         let (graded_dimension, gen_names, gen_to_idx) = crate::module_gens_from_json(&json["gens"]);

diff --git a/ext/crates/algebra/src/module/finitely_presented_module.rs b/ext/crates/algebra/src/module/finitely_presented_module.rs
@@ -6,7 +6,6 @@ use crate::module::{FreeModule, Module, ZeroModule};
 use fp::vector::{FpVector, SliceMut};
 use once::OnceBiVec;
 
-#[cfg(feature = "json")]
 use {itertools::Itertools, serde_json::Value};
 
 struct FPMIndexTable {
@@ -95,7 +94,6 @@ impl<A: Algebra> FinitelyPresentedModule<A> {
     }
 }
 
-#[cfg(feature = "json")]
 impl<A: Algebra> FinitelyPresentedModule<A> {
     pub fn from_json(algebra: Arc<A>, json: &Value) -> anyhow::Result<Self> {
         use crate::steenrod_parser::digits;

diff --git a/ext/crates/algebra/src/module/rpn.rs b/ext/crates/algebra/src/module/rpn.rs
@@ -9,7 +9,6 @@ use fp::vector::SliceMut;
 
 use std::sync::Arc;
 
-#[cfg(feature = "json")]
 use {serde::Deserialize, serde_json::Value};
 
 /// This is $\mathbb{RP}_{\mathrm{min}}^{\mathrm{max}}$. The cohomology is the subquotient of
@@ -203,15 +202,13 @@ where
     }
 }
 
-#[cfg(feature = "json")]
 #[derive(Deserialize, Debug)]
 struct RPSpec {
     min: i32,
     clear_bottom: Option<bool>,
     max: Option<i32>,
 }
 
-#[cfg(feature = "json")]
 impl<A: Algebra> RealProjectiveSpace<A> {
     pub fn from_json(algebra: Arc<A>, json: &Value) -> anyhow::Result<Self> {
         let spec: RPSpec = RPSpec::deserialize(json)?;

diff --git a/ext/crates/algebra/src/module/steenrod_module.rs b/ext/crates/algebra/src/module/steenrod_module.rs
@@ -2,7 +2,6 @@ use crate::algebra::SteenrodAlgebra;
 
 pub type SteenrodModule = Box<dyn Module<Algebra = SteenrodAlgebra>>;
 
-#[cfg(feature = "json")]
 mod json {
     use super::*;
 
@@ -42,7 +41,6 @@ mod json {
     }
 }
 
-#[cfg(feature = "json")]
 pub use json::*;
 
 use super::Module;
diff --git a/ext/crates/bivec/Cargo.toml b/ext/crates/bivec/Cargo.toml
@@ -8,7 +8,6 @@ authors = [
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.0", optional = true }
+serde = "1.0.0"
 
 [features]
-json = ["serde"]
diff --git a/ext/crates/bivec/src/lib.rs b/ext/crates/bivec/src/lib.rs
@@ -1,6 +1,6 @@
 use core::ops::Index;
 use core::ops::IndexMut;
-#[cfg(feature = "json")]
+
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::fmt;
 use std::slice::{Iter, IterMut};
@@ -245,7 +245,6 @@ impl<A> std::iter::Extend<A> for BiVec<A> {
     }
 }
 
-#[cfg(feature = "json")]
 impl<T: Serialize> Serialize for BiVec<T> {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -255,7 +254,6 @@ impl<T: Serialize> Serialize for BiVec<T> {
     }
 }
 
-#[cfg(feature = "json")]
 impl<'de, T: Deserialize<'de>> Deserialize<'de> for BiVec<T> {
     fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
     where

diff --git a/ext/crates/fp/Cargo.toml b/ext/crates/fp/Cargo.toml
@@ -10,8 +10,8 @@ build_const = "0.2.2"
 byteorder = "1.4.3"
 cfg-if = "1.0.0"
 itertools = { version = "0.10.0", default-features = false }
-serde = { version = "1.0.0", optional = true }
-serde_json = { version = "1.0.0", optional = true }
+serde = "1.0.0"
+serde_json = "1.0.0"
 
 maybe-rayon = { path = "../maybe-rayon" }
 
@@ -29,7 +29,6 @@ build_const = "0.2.2"
 [features]
 default = ["odd-primes"]
 concurrent = ["maybe-rayon/concurrent"]
-json = ["serde_json", "serde"]
 odd-primes = []
 
 [[bench]]

diff --git a/ext/crates/fp/src/prime.rs b/ext/crates/fp/src/prime.rs
@@ -1,4 +1,3 @@
-#[cfg(feature = "json")]
 use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::TryFrom;
 
@@ -113,7 +112,6 @@ impl std::fmt::Display for ValidPrime {
     }
 }
 
-#[cfg(feature = "json")]
 impl Serialize for ValidPrime {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -123,7 +121,6 @@ impl Serialize for ValidPrime {
     }
 }
 
-#[cfg(feature = "json")]
 impl<'de> Deserialize<'de> for ValidPrime {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where

diff --git a/ext/crates/fp/src/vector/vector_2.rs b/ext/crates/fp/src/vector/vector_2.rs
@@ -5,7 +5,7 @@ use std::io::{Read, Write};
 use std::mem::size_of;
 
 use itertools::Itertools;
-#[cfg(feature = "json")]
+
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use crate::limb::{entries_per_limb_const, Limb};
@@ -113,7 +113,6 @@ impl<'a> IntoIterator for &'a FpVector {
     }
 }
 
-#[cfg(feature = "json")]
 impl Serialize for FpVector {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -123,7 +122,6 @@ impl Serialize for FpVector {
     }
 }
 
-#[cfg(feature = "json")]
 impl<'de> Deserialize<'de> for FpVector {
     fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
     where

diff --git a/ext/crates/fp/src/vector/vector_generic.rs b/ext/crates/fp/src/vector/vector_generic.rs
@@ -12,7 +12,7 @@ use std::io::{Read, Write};
 use std::mem::size_of;
 
 use itertools::Itertools;
-#[cfg(feature = "json")]
+
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use crate::limb::{entries_per_limb, Limb};
@@ -428,7 +428,6 @@ impl_try_into!(_3, 3);
 impl_try_into!(_5, 5);
 impl_try_into!(_7, 7);
 
-#[cfg(feature = "json")]
 impl Serialize for FpVector {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -438,7 +437,6 @@ impl Serialize for FpVector {
     }
 }
 
-#[cfg(feature = "json")]
 impl<'de> Deserialize<'de> for FpVector {
     fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
     where

diff --git a/ext/crates/sseq/Cargo.toml b/ext/crates/sseq/Cargo.toml
@@ -13,8 +13,8 @@ fp = { path = "../fp/", default-features = false }
 maybe-rayon = { path = "../maybe-rayon" }
 once = { path = "../once/" }
 
-serde = { version = "1.0.0", optional = true }
-serde_json = { version = "1.0.0", optional = true }
+serde = "1.0.0"
+serde_json = "1.0.0"
 
 [dev-dependencies]
 expect-test = "1.1.0"
@@ -23,5 +23,4 @@ rand = "0.8"
 [features]
 default = ["odd-primes"]
 concurrent = ["maybe-rayon/concurrent"]
-json = ["serde_json", "serde"]
 odd-primes = ["fp/odd-primes"]
diff --git a/ext/crates/sseq/src/coordinates/bidegree.rs b/ext/crates/sseq/src/coordinates/bidegree.rs
@@ -3,12 +3,10 @@ use std::{
     ops::{Add, Sub},
 };
 
-#[cfg(feature = "json")]
 use serde::{Deserialize, Serialize};
 
 /// Type synonym for (s, t) bidegrees.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "json", derive(Serialize, Deserialize))]
+#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Bidegree {
     /// Homological degree
     s: u32,

diff --git a/ext/crates/sseq/src/coordinates/generator.rs b/ext/crates/sseq/src/coordinates/generator.rs
@@ -2,13 +2,11 @@ use super::{Bidegree, BidegreeElement};
 
 use std::fmt::{self, Display, Formatter};
 
-#[cfg(feature = "json")]
 use serde::{Deserialize, Serialize};
 
 /// A *basis* element of a bigraded vector space. Most commonly used to index elements of spectral
 /// sequences.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "json", derive(Serialize, Deserialize))]
+#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct BidegreeGenerator {
     /// Bidegree of the element
     degree: Bidegree,

diff --git a/web_ext/sseq_gui/Cargo.toml b/web_ext/sseq_gui/Cargo.toml
@@ -8,11 +8,11 @@ edition = "2021"
 
 [dependencies]
 algebra = { path = "../../ext/crates/algebra", default-features = false }
-bivec = { path = "../../ext/crates/bivec", features = ["json"] }
+bivec = { path = "../../ext/crates/bivec" }
 ext = { path = "../../ext", default-features = false }
-fp = { path = "../../ext/crates/fp", features = ["json"], default-features = false }
+fp = { path = "../../ext/crates/fp", default-features = false }
 once = { path = "../../ext/crates/once" }
-sseq = { path = "../../ext/crates/sseq", features = ["json"], default-features = false }
+sseq = { path = "../../ext/crates/sseq", default-features = false }
 
 anyhow = "1.0.0"
 enum_dispatch = "0.3"