Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(allocator, linter): shorten serde impls #9254

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions crates/oxc_allocator/src/boxed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,9 @@ impl<T: ?Sized + Debug> Debug for Box<'_, T> {
// }

#[cfg(any(feature = "serialize", test))]
impl<T> Serialize for Box<'_, T>
where
T: Serialize,
{
fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
self.deref().serialize(s)
impl<T: Serialize> Serialize for Box<'_, T> {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
self.deref().serialize(serializer)
}
}

Expand Down
31 changes: 0 additions & 31 deletions crates/oxc_allocator/src/serialize.rs

This file was deleted.

18 changes: 4 additions & 14 deletions crates/oxc_allocator/src/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use std::{
use allocator_api2::vec::Vec as InnerVec;
use bumpalo::Bump;
#[cfg(any(feature = "serialize", test))]
use serde::{ser::SerializeSeq, Serialize, Serializer};
use serde::{Serialize, Serializer};

use crate::{Allocator, Box};

Expand Down Expand Up @@ -273,19 +273,9 @@ where
}

#[cfg(any(feature = "serialize", test))]
impl<T> Serialize for Vec<'_, T>
where
T: Serialize,
{
fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
let mut seq = s.serialize_seq(Some(self.0.len()))?;
for e in self.0.iter() {
seq.serialize_element(e)?;
}
seq.end()
impl<T: Serialize> Serialize for Vec<'_, T> {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
self.as_slice().serialize(serializer)
}
}

Expand Down
16 changes: 5 additions & 11 deletions crates/oxc_linter/src/config/overrides.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::{borrow::Cow, ops::Deref, path::Path};

use nonmax::NonMaxU32;
use schemars::{gen, schema::Schema, JsonSchema};
use serde::{de, ser, Deserialize, Serialize};
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};

use oxc_index::{Idx, IndexVec};

Expand Down Expand Up @@ -126,20 +126,14 @@ impl GlobSet {
}
}

impl ser::Serialize for GlobSet {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: ser::Serializer,
{
impl Serialize for GlobSet {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
self.raw.serialize(serializer)
}
}

impl<'de> de::Deserialize<'de> for GlobSet {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: de::Deserializer<'de>,
{
impl<'de> Deserialize<'de> for GlobSet {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
let globs = Vec::<String>::deserialize(deserializer)?;
Self::new(globs).map_err(de::Error::custom)
}
Expand Down
7 changes: 2 additions & 5 deletions crates/oxc_linter/src/config/rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use schemars::{gen::SchemaGenerator, schema::Schema, JsonSchema};
use serde::{
de::{self, Deserializer, Visitor},
ser::SerializeMap,
Deserialize, Serialize,
Deserialize, Serialize, Serializer,
};

use oxc_diagnostics::{Error, OxcDiagnostic};
Expand Down Expand Up @@ -206,10 +206,7 @@ impl JsonSchema for OxlintRules {
}

impl Serialize for OxlintRules {
fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
let mut rules = s.serialize_map(Some(self.rules.len()))?;

for rule in &self.rules {
Expand Down
5 changes: 1 addition & 4 deletions crates/oxc_linter/src/config/settings/next.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ impl<T> Default for OneOrMany<T> {
}

impl<T: Serialize> Serialize for OneOrMany<T> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
match self {
Self::One(val) => val.serialize(serializer),
Self::Many(vec) => vec.serialize(serializer),
Expand Down
Loading