Skip to content

Commit 446e09c

Browse files
SyttenSytten
committed
Remove serde0 feature, bump tp 0.9.0
1 parent 7acbae4 commit 446e09c

9 files changed

Lines changed: 79 additions & 81 deletions

File tree

‎Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "chromiumoxide"
3-
version = "0.8.0"
3+
version = "0.9.0"
44
rust-version = "1.85"
55
autotests = false
66
authors = ["Matthias Seitz <[email protected]>"]
@@ -17,9 +17,9 @@ categories = ["web-programming", "api-bindings", "development-tools::testing"]
1717
async-tungstenite = { version = "0.32", features = ["tokio-runtime"] }
1818
serde = { version = "1", features = ["derive"] }
1919
futures = "0.3"
20-
chromiumoxide_types = { path = "chromiumoxide_types", version = "0.8" }
21-
chromiumoxide_cdp = { path = "chromiumoxide_cdp", version = "0.8" }
22-
chromiumoxide_fetcher = { path = "chromiumoxide_fetcher", version = "0.8", default-features = false, optional = true }
20+
chromiumoxide_types = { path = "chromiumoxide_types", version = "0.9" }
21+
chromiumoxide_cdp = { path = "chromiumoxide_cdp", version = "0.9" }
22+
chromiumoxide_fetcher = { path = "chromiumoxide_fetcher", version = "0.9", default-features = false, optional = true }
2323
serde_json = "1"
2424
which = "8"
2525
thiserror = "2"
@@ -55,11 +55,11 @@ tokio = { version = "1", features = ["rt-multi-thread", "time", "macros"] }
5555
default = ["bytes"]
5656
fetcher = ["chromiumoxide_fetcher"]
5757
bytes = ["dep:bytes"]
58-
serde0 = []
5958

6059
rustls = ["chromiumoxide_fetcher/rustls"]
6160
native-tls = ["chromiumoxide_fetcher/native-tls"]
6261

62+
6363
[[example]]
6464
name = "fetcher"
6565
required-features = ["fetcher"]

‎chromiumoxide_cdp/Cargo.toml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "chromiumoxide_cdp"
3-
version = "0.8.0"
3+
version = "0.9.0"
44
authors = ["Matthias Seitz <[email protected]>"]
55
edition = "2024"
66
rust-version = "1.85"
@@ -11,16 +11,14 @@ repository = "https://github.com/mattsse/chromiumoxide"
1111
readme = "../README.md"
1212
include = ["src/**/*", "*.pdl", "LICENSE-*"]
1313

14-
[features]
15-
serde0 = []
1614

1715
[dev-dependencies]
18-
chromiumoxide_pdl = { path = "../chromiumoxide_pdl", version = "0.8" }
16+
chromiumoxide_pdl = { path = "../chromiumoxide_pdl", version = "0.9" }
1917
ureq = "2.10.0"
2018
tempfile = "3.10.1"
2119

2220
[dependencies]
23-
chromiumoxide_pdl = { path = "../chromiumoxide_pdl", version = "0.8" }
24-
chromiumoxide_types = { path = "../chromiumoxide_types", version = "0.8" }
21+
chromiumoxide_pdl = { path = "../chromiumoxide_pdl", version = "0.9" }
22+
chromiumoxide_types = { path = "../chromiumoxide_types", version = "0.9" }
2523
serde = { version = "1", features = ["derive"] }
2624
serde_json = "1"

‎chromiumoxide_fetcher/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "chromiumoxide_fetcher"
3-
version = "0.8.0"
3+
version = "0.9.0"
44
authors = ["Matthias Seitz <[email protected]>"]
55
edition = "2024"
66
rust-version = "1.85"
@@ -31,10 +31,10 @@ anyhow = "1"
3131
directories = "6"
3232
serde = { version = "1", features = ["derive"] }
3333
tracing = "0.1"
34-
zip-0_6 = { package = "zip", version = "0.6", default-features = false, features = [
34+
zip0 = { package = "zip", version = "0.6", default-features = false, features = [
3535
"deflate",
3636
], optional = true }
37-
zip-8 = { package = "zip", version = "8", default-features = false, features = [
37+
zip8 = { package = "zip", version = "8", default-features = false, features = [
3838
"deflate-flate2-zlib-rs",
3939
], optional = true }
4040
tokio = { version = "1", features = ["fs", "io-util"] }
@@ -44,7 +44,7 @@ reqwest = { version = "0.13", default-features = false, features = ["json"] }
4444
windows-version = "0.1"
4545

4646
[features]
47-
default = ["rustls", "zip-8"]
47+
default = ["rustls", "zip8"]
4848

4949
rustls = ["reqwest/rustls"]
5050
native-tls = ["reqwest/native-tls"]

‎chromiumoxide_fetcher/src/runtime/zip/mod.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#[cfg(feature = "zip-0_6")]
2-
mod zip_0_6;
3-
#[cfg(feature = "zip-0_6")]
4-
pub use zip_0_2::ZipArchive;
1+
#[cfg(feature = "zip0")]
2+
mod zip0;
3+
#[cfg(feature = "zip0")]
4+
pub use zip0::ZipArchive;
55

6-
#[cfg(feature = "zip-8")]
7-
mod zip_8;
8-
#[cfg(feature = "zip-8")]
9-
pub use zip_8::ZipArchive;
6+
#[cfg(feature = "zip8")]
7+
mod zip8;
8+
#[cfg(feature = "zip8")]
9+
pub use zip8::ZipArchive;

chromiumoxide_fetcher/src/runtime/zip/zip_0_6.rs renamed to chromiumoxide_fetcher/src/runtime/zip/zip0.rs

File renamed without changes.

chromiumoxide_fetcher/src/runtime/zip/zip_8.rs renamed to chromiumoxide_fetcher/src/runtime/zip/zip8.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ use std::io::{self, Read, Seek};
33
use std::ops::{Deref, DerefMut};
44
use std::path::Path;
55

6-
use zip_8::{
6+
use zip8::{
77
read::ZipFile,
88
result::{ZipError, ZipResult},
99
};
1010

1111
#[derive(Clone, Debug)]
12-
pub struct ZipArchive<R: Read + Seek>(zip_8::ZipArchive<R>);
12+
pub struct ZipArchive<R: Read + Seek>(zip8::ZipArchive<R>);
1313

1414
impl<R: Read + Seek> Deref for ZipArchive<R> {
15-
type Target = zip_8::ZipArchive<R>;
15+
type Target = zip8::ZipArchive<R>;
1616

1717
fn deref(&self) -> &Self::Target {
1818
&self.0
@@ -27,7 +27,7 @@ impl<R: Read + Seek> DerefMut for ZipArchive<R> {
2727

2828
impl<R: Read + Seek> ZipArchive<R> {
2929
pub fn new(reader: R) -> ZipResult<Self> {
30-
zip_8::ZipArchive::new(reader).map(Self)
30+
zip8::ZipArchive::new(reader).map(Self)
3131
}
3232

3333
/// We need this custom extract function to support symlinks.

‎chromiumoxide_pdl/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "chromiumoxide_pdl"
3-
version = "0.8.0"
3+
version = "0.9.0"
44
authors = ["Matthias Seitz <[email protected]>"]
55
edition = "2024"
66
rust-version = "1.85"
@@ -18,9 +18,9 @@ quote = "1.0.10"
1818
proc-macro2 = "1.0.32"
1919
heck = "0.4"
2020
serde_json = "1"
21-
serde = { version = "1", features = ["derive"] }
22-
chromiumoxide_types = { path = "../chromiumoxide_types", version = "0.8" }
21+
serde = { version = "1", features = ["derive"], optional = true }
22+
chromiumoxide_types = { path = "../chromiumoxide_types", version = "0.9" }
2323
either = "1.6.1"
2424

2525
[features]
26-
serde0 = []
26+
serde = ["dep:serde"]

‎chromiumoxide_pdl/src/pdl/mod.rs‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,69 +3,69 @@ mod error;
33
pub mod parser;
44
pub mod resolver;
55

6-
#[cfg(feature = "serde0")]
6+
#[cfg(feature = "serde")]
77
use serde::{Deserialize, Serialize};
88

9-
#[cfg(feature = "serde0")]
9+
#[cfg(feature = "serde")]
1010
mod ser;
1111

1212
use std::borrow::Cow;
1313

1414
pub use self::error::Error;
1515

16-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
16+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
1717
#[derive(Clone, Debug, Default, PartialEq, Eq)]
1818
pub struct Protocol<'a> {
19-
#[cfg_attr(feature = "serde0", serde(skip_serializing))]
19+
#[cfg_attr(feature = "serde", serde(skip_serializing))]
2020
pub description: Option<Cow<'a, str>>,
2121
pub version: Version,
22-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Vec::is_empty"))]
22+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Vec::is_empty"))]
2323
pub domains: Vec<Domain<'a>>,
2424
}
2525

26-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
26+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
2727
#[derive(Clone, Debug, Default, PartialEq, Eq)]
2828
pub struct Version {
29-
#[cfg_attr(feature = "serde0", serde(serialize_with = "ser::serialize_usize"))]
29+
#[cfg_attr(feature = "serde", serde(serialize_with = "ser::serialize_usize"))]
3030
pub major: usize,
31-
#[cfg_attr(feature = "serde0", serde(serialize_with = "ser::serialize_usize"))]
31+
#[cfg_attr(feature = "serde", serde(serialize_with = "ser::serialize_usize"))]
3232
pub minor: usize,
3333
}
3434

35-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
35+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
3636
#[derive(Clone, Debug, PartialEq, Eq)]
3737
pub struct Domain<'a> {
38-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Option::is_none"))]
38+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
3939
pub description: Option<Cow<'a, str>>,
40-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
40+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
4141
pub experimental: bool,
42-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
42+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
4343
pub deprecated: bool,
44-
#[cfg_attr(feature = "serde0", serde(rename = "domain"))]
44+
#[cfg_attr(feature = "serde", serde(rename = "domain"))]
4545
pub name: Cow<'a, str>,
46-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Vec::is_empty"))]
46+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Vec::is_empty"))]
4747
pub dependencies: Vec<Cow<'a, str>>,
48-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Vec::is_empty"))]
48+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Vec::is_empty"))]
4949
pub types: Vec<TypeDef<'a>>,
50-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Vec::is_empty"))]
50+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Vec::is_empty"))]
5151
pub commands: Vec<Command<'a>>,
52-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Vec::is_empty"))]
52+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Vec::is_empty"))]
5353
pub events: Vec<Event<'a>>,
5454
}
5555

56-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
56+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
5757
#[derive(Clone, Debug, PartialEq, Eq)]
5858
pub struct TypeDef<'a> {
59-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Option::is_none"))]
59+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
6060
pub description: Option<Cow<'a, str>>,
61-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
61+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
6262
pub experimental: bool,
63-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
63+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
6464
pub deprecated: bool,
6565
pub name: Cow<'a, str>,
66-
#[cfg_attr(feature = "serde0", serde(flatten))]
66+
#[cfg_attr(feature = "serde", serde(flatten))]
6767
pub extends: Type<'a>,
68-
#[cfg_attr(feature = "serde0", serde(flatten))]
68+
#[cfg_attr(feature = "serde", serde(flatten))]
6969
pub item: Option<Item<'a>>,
7070
// RawType is the raw type.
7171
pub raw_name: Cow<'a, str>,
@@ -79,7 +79,7 @@ impl<'a> TypeDef<'a> {
7979
}
8080
}
8181

82-
#[cfg_attr(feature = "serde0", derive(Deserialize))]
82+
#[cfg_attr(feature = "serde", derive(Deserialize))]
8383
#[derive(Clone, Debug, PartialEq, Eq)]
8484
pub enum Type<'a> {
8585
Integer,
@@ -126,19 +126,19 @@ impl Type<'_> {
126126
}
127127
}
128128

129-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
130-
#[cfg_attr(feature = "serde0", serde(rename_all = "lowercase"))]
129+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
130+
#[cfg_attr(feature = "serde", serde(rename_all = "lowercase"))]
131131
#[derive(Clone, Debug, PartialEq, Eq)]
132132
pub enum Item<'a> {
133-
#[cfg_attr(feature = "serde0", serde(serialize_with = "ser::serialize_enum"))]
133+
#[cfg_attr(feature = "serde", serde(serialize_with = "ser::serialize_enum"))]
134134
Enum(Vec<Variant<'a>>),
135135
Properties(Vec<Param<'a>>),
136136
}
137137

138-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
138+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
139139
#[derive(Clone, Debug, PartialEq, Eq)]
140140
pub struct Variant<'a> {
141-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Option::is_none"))]
141+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
142142
pub description: Option<Cow<'a, str>>,
143143
pub name: Cow<'a, str>,
144144
}
@@ -152,18 +152,18 @@ impl<'a> Variant<'a> {
152152
}
153153
}
154154

155-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
155+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
156156
#[derive(Clone, Debug, PartialEq, Eq)]
157157
pub struct Param<'a> {
158-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Option::is_none"))]
158+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
159159
pub description: Option<Cow<'a, str>>,
160-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
160+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
161161
pub experimental: bool,
162-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
162+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
163163
pub deprecated: bool,
164-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
164+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
165165
pub optional: bool,
166-
#[cfg_attr(feature = "serde0", serde(flatten))]
166+
#[cfg_attr(feature = "serde", serde(flatten))]
167167
pub r#type: Type<'a>,
168168
pub name: Cow<'a, str>,
169169
// RawType is the raw type.
@@ -172,48 +172,48 @@ pub struct Param<'a> {
172172
pub is_circular_dep: bool,
173173
}
174174

175-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
175+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
176176
#[derive(Clone, Debug, PartialEq, Eq)]
177177
pub struct Command<'a> {
178-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Option::is_none"))]
178+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
179179
pub description: Option<Cow<'a, str>>,
180-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
180+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
181181
pub experimental: bool,
182-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
182+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
183183
pub deprecated: bool,
184184
pub name: Cow<'a, str>,
185-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Option::is_none"))]
186-
#[cfg_attr(feature = "serde0", serde(serialize_with = "ser::serialize_redirect"))]
185+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
186+
#[cfg_attr(feature = "serde", serde(serialize_with = "ser::serialize_redirect"))]
187187
pub redirect: Option<Redirect<'a>>,
188-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Vec::is_empty"))]
188+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Vec::is_empty"))]
189189
pub parameters: Vec<Param<'a>>,
190-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Vec::is_empty"))]
190+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Vec::is_empty"))]
191191
pub returns: Vec<Param<'a>>,
192192
// RawType is the raw type.
193193
pub raw_name: Cow<'a, str>,
194194
// is_circular_dep indicates a type that causes circular dependencies.
195195
pub is_circular_dep: bool,
196196
}
197197

198-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
198+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
199199
#[derive(Clone, Debug, PartialEq, Eq)]
200200
pub struct Event<'a> {
201-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Option::is_none"))]
201+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
202202
pub description: Option<Cow<'a, str>>,
203-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
203+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
204204
pub experimental: bool,
205-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "ser::is_false"))]
205+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "ser::is_false"))]
206206
pub deprecated: bool,
207207
pub name: Cow<'a, str>,
208-
#[cfg_attr(feature = "serde0", serde(skip_serializing_if = "Vec::is_empty"))]
208+
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Vec::is_empty"))]
209209
pub parameters: Vec<Param<'a>>,
210210
// RawType is the raw type.
211211
pub raw_name: Cow<'a, str>,
212212
// IsCircularDep indicates a type that causes circular dependencies.
213213
pub is_circular_dep: bool,
214214
}
215215

216-
#[cfg_attr(feature = "serde0", derive(Serialize, Deserialize))]
216+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
217217
#[derive(Clone, Debug, PartialEq, Eq)]
218218
pub struct Redirect<'a> {
219219
pub description: Option<Cow<'a, str>>,

‎chromiumoxide_types/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "chromiumoxide_types"
3-
version = "0.8.0"
3+
version = "0.9.0"
44
authors = ["Matthias Seitz <[email protected]>"]
55
edition = "2024"
66
description = "Contains the essential types necessary for using chromiumoxide"

0 commit comments

Comments
 (0)