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.

Sign up for GitHub

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

De-Escaping strings using a provided buffer #83

Merged
merged 14 commits into from
Aug 6, 2024
Merged

De-Escaping strings using a provided buffer #83

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a3851a4
De-Escaping strings using a provided buffer
sammhicks Apr 16, 2024
c6e7e38
Using `r#""#` syntax for char unit tests
sammhicks Jul 24, 2024
35765f4
The default unescaping buffer length is now 0, not 128, with an error…
sammhicks Jul 24, 2024
b8fab52
Improved function names
sammhicks Jul 24, 2024
ba04b10
Merge remote-tracking branch 'upstream/master'
sammhicks Jul 24, 2024
4c6de3d
Using manual implementation of `<[u8]>::split_first_chunk::<4>`
sammhicks Jul 24, 2024
0141836
`from_slice` and `from_str` do not attempt to unescape strings
sammhicks Jul 25, 2024
6a7102e
Created new struct `EscapedString` which borrows escaped strings from…
sammhicks Jul 25, 2024
bb38c68
`core::str::FromStr::from_str(s)` => `s.parse()`
sammhicks Jul 30, 2024
0350c3f
Simplified EscapedStr, propegating unescaping errors upwards
sammhicks Jul 30, 2024
c505081
Removed outdated comment
sammhicks Jul 30, 2024
d254fc8
Implemented early return instead of indented if statement for `deseri…
sammhicks Jul 30, 2024
fb0b8da
Bumped MSRV to 1.65.0
sammhicks Jul 30, 2024
9f6af47
Documented escaped string deserialization.
sammhicks Aug 6, 2024
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
24 changes: 12 additions & 12 deletions src/de/enum_.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ use serde::de;

use crate::de::{Deserializer, Error, Result};

pub(crate) struct UnitVariantAccess<'a, 'b> {
de: &'a mut Deserializer<'b>,
pub(crate) struct UnitVariantAccess<'a, 'b, 's> {
de: &'a mut Deserializer<'b, 's>,
}

impl<'a, 'b> UnitVariantAccess<'a, 'b> {
pub(crate) fn new(de: &'a mut Deserializer<'b>) -> Self {
impl<'a, 'b, 's> UnitVariantAccess<'a, 'b, 's> {
pub(crate) fn new(de: &'a mut Deserializer<'b, 's>) -> Self {
UnitVariantAccess { de }
}
}

impl<'a, 'de> de::EnumAccess<'de> for UnitVariantAccess<'a, 'de> {
impl<'a, 'de, 's> de::EnumAccess<'de> for UnitVariantAccess<'a, 'de, 's> {
type Error = Error;
type Variant = Self;

Expand All @@ -25,7 +25,7 @@ impl<'a, 'de> de::EnumAccess<'de> for UnitVariantAccess<'a, 'de> {
}
}

impl<'de, 'a> de::VariantAccess<'de> for UnitVariantAccess<'a, 'de> {
impl<'de, 'a, 's> de::VariantAccess<'de> for UnitVariantAccess<'a, 'de, 's> {
type Error = Error;

fn unit_variant(self) -> Result<()> {
Expand Down Expand Up @@ -54,17 +54,17 @@ impl<'de, 'a> de::VariantAccess<'de> for UnitVariantAccess<'a, 'de> {
}
}

pub(crate) struct VariantAccess<'a, 'b> {
de: &'a mut Deserializer<'b>,
pub(crate) struct VariantAccess<'a, 'b, 's> {
de: &'a mut Deserializer<'b, 's>,
}

impl<'a, 'b> VariantAccess<'a, 'b> {
pub(crate) fn new(de: &'a mut Deserializer<'b>) -> Self {
impl<'a, 'b, 's> VariantAccess<'a, 'b, 's> {
pub(crate) fn new(de: &'a mut Deserializer<'b, 's>) -> Self {
VariantAccess { de }
}
}

impl<'a, 'de> de::EnumAccess<'de> for VariantAccess<'a, 'de> {
impl<'a, 'de, 's> de::EnumAccess<'de> for VariantAccess<'a, 'de, 's> {
type Error = Error;
type Variant = Self;

Expand All @@ -78,7 +78,7 @@ impl<'a, 'de> de::EnumAccess<'de> for VariantAccess<'a, 'de> {
}
}

impl<'de, 'a> de::VariantAccess<'de> for VariantAccess<'a, 'de> {
impl<'de, 'a, 's> de::VariantAccess<'de> for VariantAccess<'a, 'de, 's> {
type Error = Error;

fn unit_variant(self) -> Result<()> {
Expand Down
16 changes: 8 additions & 8 deletions src/de/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ use serde::de::{self, Visitor};

use crate::de::{Deserializer, Error};

pub struct MapAccess<'a, 'b> {
de: &'a mut Deserializer<'b>,
pub struct MapAccess<'a, 'b, 's> {
de: &'a mut Deserializer<'b, 's>,
first: bool,
}

impl<'a, 'b> MapAccess<'a, 'b> {
pub(crate) fn new(de: &'a mut Deserializer<'b>) -> Self {
impl<'a, 'b, 's> MapAccess<'a, 'b, 's> {
pub(crate) fn new(de: &'a mut Deserializer<'b, 's>) -> Self {
MapAccess { de, first: true }
}
}

impl<'a, 'de> de::MapAccess<'de> for MapAccess<'a, 'de> {
impl<'a, 'de, 's> de::MapAccess<'de> for MapAccess<'a, 'de, 's> {
type Error = Error;

fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>, Error>
Expand Down Expand Up @@ -57,11 +57,11 @@ impl<'a, 'de> de::MapAccess<'de> for MapAccess<'a, 'de> {
}
}

struct MapKey<'a, 'b> {
de: &'a mut Deserializer<'b>,
struct MapKey<'a, 'b, 's> {
de: &'a mut Deserializer<'b, 's>,
}

impl<'de, 'a> de::Deserializer<'de> for MapKey<'a, 'de> {
impl<'de, 'a, 's> de::Deserializer<'de> for MapKey<'a, 'de, 's> {
type Error = Error;

fn deserialize_any<V>(self, _visitor: V) -> Result<V::Value, Error>
Expand Down
Loading