Skip to content

Commit 3cf78d1

Browse files
authored
Merge f1fbada into 7466647
2 parents 7466647 + f1fbada commit 3cf78d1

File tree

3 files changed

+54
-13
lines changed

3 files changed

+54
-13
lines changed

.github/workflows/ci.yaml

+37-1
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,55 @@ on:
1212
- cron: '0 0 * * 0'
1313

1414
jobs:
15+
lock:
16+
name: Cargo.lock
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout the Repository
20+
uses: actions/checkout@v3
21+
- name: Install the Rust toolchain
22+
uses: actions-rs/toolchain@v1
23+
with:
24+
toolchain: nightly
25+
profile: minimal
26+
override: true
27+
- name: Generate the minimum version lockfile
28+
run: |
29+
cargo update -Z minimal-versions
30+
cargo update -Z direct-minimal-versions
31+
mv Cargo.lock Cargo.lock.min
32+
- name: Generate the current version lockfile
33+
run: cargo update
34+
- name: Upload the Cargo lockfiles
35+
uses: actions/upload-artifact@v4
36+
with:
37+
name: Cargo.lock
38+
path: |
39+
Cargo.lock
40+
Cargo.lock.min
41+
1542
tests:
1643
name: Tests
1744
runs-on: ubuntu-latest
45+
needs: lock
1846

1947
strategy:
2048
matrix:
2149
rust: [1.64.0, stable, nightly]
50+
lock: ["Cargo.lock", "Cargo.lock.min"]
2251

2352
steps:
2453
- uses: actions/checkout@v3
54+
- name: Download the Cargo lockfiles
55+
uses: actions/download-artifact@v4
56+
with:
57+
name: Cargo.lock
58+
- name: Rename ${{ matrix.lock }} to Cargo.lock
59+
run: mv ${{ matrix.lock }} Cargo.lock
60+
if: ${{ matrix.lock != 'Cargo.lock' }}
2561
- uses: ./.github/actions/setup
2662
with:
27-
key: test-${{ matrix.rust }}
63+
key: test-${{ matrix.rust }}-${{ matrix.lock }}
2864
- uses: actions-rs/toolchain@v1
2965
with:
3066
toolchain: ${{ matrix.rust }}

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased
88

9+
- Fix issue [#556](https://github.com/ron-rs/ron/issues/556) and update minium dependency versions ([#557](https://github.com/ron-rs/ron/pull/557))
10+
911
## [0.9.0] - 2023-09-??
1012

1113
### API Changes

Cargo.toml

+15-12
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,24 @@ integer128 = []
2525

2626
[dependencies]
2727
# FIXME @juntyr remove base64 once old byte strings are fully deprecated
28-
base64 = "0.22"
29-
bitflags = { version = "2.0", features = ["serde"] }
30-
indexmap = { version = "2.0", features = ["serde"], optional = true }
28+
base64 = { version = "0.22", default-features = false, features = ["std"] }
29+
bitflags = { version = "2.1", default-features = false, features = ["serde"] }
30+
indexmap = { version = "2.0", default-features = false, features = ["std", "serde"], optional = true }
3131
# serde supports i128/u128 from 1.0.60 onwards
32-
serde = "1.0.60"
33-
serde_derive = "1.0"
34-
unicode-ident = "1.0"
32+
# serde's IntoDeserializer impls suport new constructor from 1.0.139 onwards
33+
# serde's adjacently tagged enums support integer tags from 1.0.181 onwards
34+
serde = { version = "1.0.181", default-features = false, features = ["std"] }
35+
serde_derive = { version = "1.0.181", default-features = false }
36+
unicode-ident = { version = "1.0", default-features = false }
3537

3638
[dev-dependencies]
37-
serde = { version = "1.0", features = ["derive"] }
38-
serde_bytes = "0.11"
39-
serde_json = "1.0"
40-
option_set = "0.2"
41-
typetag = "0.2"
42-
bytes = { version = "1.3", features = ["serde"] }
39+
serde = { version = "1.0.181", default-features = false, features = ["std", "derive"] }
40+
serde_bytes = { version = "0.11", default-features = false, features = ["std"] }
41+
# serde_json supports the std feature from 1.0.60 onwards
42+
serde_json = { version = "1.0.60", default-features = false, features = ["std"] }
43+
option_set = { version = "0.2", default-features = false }
44+
typetag = { version = "0.2", default-features = false }
45+
bytes = { version = "1.3", default-features = false, features = ["serde"] }
4346

4447
[package.metadata.docs.rs]
4548
features = ["integer128", "indexmap"]

0 commit comments

Comments
 (0)