Skip to content

Commit d666742

Browse files
authored
Bump ron to 0.10.1 (#6861)
This should help `cargo-deny` be at peace with #6860, pending gfx-rs/wgpu#7557.
1 parent 3a02963 commit d666742

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

Cargo.lock

+8-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is automatically @generated by Cargo.
22
# It is not intended for manual editing.
3-
version = 3
3+
version = 4
44

55
[[package]]
66
name = "ab_glyph"
@@ -539,12 +539,6 @@ dependencies = [
539539
"windows-targets 0.52.6",
540540
]
541541

542-
[[package]]
543-
name = "base64"
544-
version = "0.21.7"
545-
source = "registry+https://github.com/rust-lang/crates.io-index"
546-
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
547-
548542
[[package]]
549543
name = "base64"
550544
version = "0.22.1"
@@ -3153,7 +3147,7 @@ version = "1.7.0"
31533147
source = "registry+https://github.com/rust-lang/crates.io-index"
31543148
checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
31553149
dependencies = [
3156-
"base64 0.22.1",
3150+
"base64",
31573151
"indexmap",
31583152
"quick-xml 0.32.0",
31593153
"serde",
@@ -3542,14 +3536,15 @@ dependencies = [
35423536

35433537
[[package]]
35443538
name = "ron"
3545-
version = "0.8.1"
3539+
version = "0.10.1"
35463540
source = "registry+https://github.com/rust-lang/crates.io-index"
3547-
checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
3541+
checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f"
35483542
dependencies = [
3549-
"base64 0.21.7",
3543+
"base64",
35503544
"bitflags 2.8.0",
35513545
"serde",
35523546
"serde_derive",
3547+
"unicode-ident",
35533548
]
35543549

35553550
[[package]]
@@ -4344,7 +4339,7 @@ version = "2.10.1"
43444339
source = "registry+https://github.com/rust-lang/crates.io-index"
43454340
checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
43464341
dependencies = [
4347-
"base64 0.22.1",
4342+
"base64",
43484343
"flate2",
43494344
"log",
43504345
"once_cell",
@@ -4386,7 +4381,7 @@ version = "0.45.0"
43864381
source = "registry+https://github.com/rust-lang/crates.io-index"
43874382
checksum = "2ac8e0e3e4696253dc06167990b3fe9a2668ab66270adf949a464db4088cb354"
43884383
dependencies = [
4389-
"base64 0.22.1",
4384+
"base64",
43904385
"data-url",
43914386
"flate2",
43924387
"fontdb",

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ profiling = { version = "1.0.16", default-features = false }
9494
puffin = "0.19"
9595
puffin_http = "0.16"
9696
raw-window-handle = "0.6.0"
97-
ron = "0.8"
97+
ron = "0.10.1"
9898
serde = { version = "1", features = ["derive"] }
9999
similar-asserts = "1.4.2"
100100
thiserror = "1.0.37"

crates/eframe/src/native/file_storage.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ fn save_to_disk(file_path: &PathBuf, kv: &HashMap<String, String>) {
207207
let config = Default::default();
208208

209209
profiling::scope!("ron::serialize");
210-
if let Err(err) = ron::ser::to_writer_pretty(&mut writer, &kv, config)
210+
if let Err(err) = ron::Options::default()
211+
.to_io_writer_pretty(&mut writer, &kv, config)
211212
.and_then(|_| writer.flush().map_err(|err| err.into()))
212213
{
213214
log::warn!("Failed to serialize app state: {}", err);

deny.toml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ deny = [
4545
]
4646

4747
skip = [
48-
{ name = "base64" }, # Pretty small
4948
{ name = "bit-set" }, # wgpu's naga depends on 0.8, syntect's (used by egui_extras) fancy-regex depends on 0.5
5049
{ name = "bit-vec" }, # dependency of bit-set in turn, different between 0.6 and 0.5
5150
{ name = "bitflags" }, # old 1.0 version via glutin, png, spirv, …

0 commit comments

Comments
 (0)