Skip to content

Commit 991e344

Browse files
committed
Raise required compiler for serde_derive to 1.61
This is the rust-version declared by recent versions of Syn.
1 parent 6a7de26 commit 991e344

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,19 @@ jobs:
9595
- run: cd serde && cargo build
9696

9797
derive:
98-
name: Rust 1.56.0
98+
name: Rust 1.61.0
9999
runs-on: ubuntu-latest
100100
timeout-minutes: 45
101101
steps:
102102
- uses: actions/checkout@v4
103-
- uses: dtolnay/[email protected]
104-
- run: sed -i '/"test_suite"/d' Cargo.toml
103+
- uses: dtolnay/[email protected]
104+
- run: |
105+
sed -i 's/proc-macro2 = { workspace = true/proc-macro2 = { version = "1"/' serde_derive*/Cargo.toml
106+
sed -i 's/quote = { workspace = true/quote = { version = "1"/' serde_derive*/Cargo.toml
107+
sed -i 's/syn = { workspace = true/syn = { version = "2"/' serde_derive*/Cargo.toml
105108
- run: cd serde && cargo check --no-default-features
106109
- run: cd serde && cargo check
107110
- run: cd serde_derive && cargo check
108-
continue-on-error: true # FIXME
109111

110112
alloc:
111113
name: Rust 1.36.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Serde   [![Build Status]][actions] [![Latest Version]][crates.io] [![serde msrv]][Rust 1.31] [![serde_derive msrv]][Rust 1.56]
1+
# Serde   [![Build Status]][actions] [![Latest Version]][crates.io] [![serde msrv]][Rust 1.31] [![serde_derive msrv]][Rust 1.61]
22

33
[Build Status]: https://img.shields.io/github/actions/workflow/status/serde-rs/serde/ci.yml?branch=master
44
[actions]: https://github.com/serde-rs/serde/actions?query=branch%3Amaster
@@ -7,7 +7,7 @@
77
[serde msrv]: https://img.shields.io/crates/msrv/serde.svg?label=serde%20msrv&color=lightgray
88
[serde_derive msrv]: https://img.shields.io/crates/msrv/serde_derive.svg?label=serde_derive%20msrv&color=lightgray
99
[Rust 1.31]: https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html
10-
[Rust 1.56]: https://blog.rust-lang.org/2021/10/21/Rust-1.56.0.html
10+
[Rust 1.61]: https://blog.rust-lang.org/2022/05/19/Rust-1.61.0.html
1111

1212
**Serde is a framework for *ser*ializing and *de*serializing Rust data structures efficiently and generically.**
1313

serde/build.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ fn main() {
5050
println!("cargo:rustc-cfg=no_float_copysign");
5151
}
5252

53-
// Current minimum supported version of serde_derive crate is Rust 1.56.
54-
if minor < 56 {
55-
println!("cargo:rustc-cfg=no_serde_derive");
56-
}
57-
5853
// Support for #[cfg(target_has_atomic = "...")] stabilized in Rust 1.60.
5954
if minor < 60 {
6055
println!("cargo:rustc-cfg=no_target_has_atomic");
@@ -76,6 +71,11 @@ fn main() {
7671
}
7772
}
7873

74+
// Current minimum supported version of serde_derive crate is Rust 1.61.
75+
if minor < 61 {
76+
println!("cargo:rustc-cfg=no_serde_derive");
77+
}
78+
7979
// Support for core::ffi::CStr and alloc::ffi::CString stabilized in Rust 1.64.
8080
// https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html#c-compatible-ffi-types-in-core-and-alloc
8181
if minor < 64 {

serde_derive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ keywords = ["serde", "serialization", "no_std", "derive"]
1212
license = "MIT OR Apache-2.0"
1313
readme = "crates-io.md"
1414
repository = "https://github.com/serde-rs/serde"
15-
rust-version = "1.56"
15+
rust-version = "1.61"
1616

1717
[features]
1818
default = []

serde_derive_internals/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ homepage = "https://serde.rs"
1010
keywords = ["serde", "serialization"]
1111
license = "MIT OR Apache-2.0"
1212
repository = "https://github.com/serde-rs/serde"
13-
rust-version = "1.56"
13+
rust-version = "1.61"
1414

1515
[lib]
1616
path = "lib.rs"

0 commit comments

Comments
 (0)