Skip to content

Commit 74817b7

Browse files
DirrekeDirreke
committedAug 14, 2023
Upgrade Object and related deps
1 parent 712f448 commit 74817b7

File tree

13 files changed

+117
-78
lines changed

13 files changed

+117
-78
lines changed
 

‎Cargo.lock

+69-55
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,29 @@ version = "0.20.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
99
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
1010
dependencies = [
11-
"compiler_builtins",
1211
"gimli 0.27.3",
13-
"rustc-std-workspace-alloc",
14-
"rustc-std-workspace-core",
1512
]
1613

1714
[[package]]
18-
name = "adler"
19-
version = "1.0.2"
15+
name = "addr2line"
16+
version = "0.21.0"
2017
source = "registry+https://github.com/rust-lang/crates.io-index"
21-
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
18+
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
2219
dependencies = [
2320
"compiler_builtins",
21+
"gimli 0.28.0",
22+
"rustc-std-workspace-alloc",
2423
"rustc-std-workspace-core",
2524
]
2625

2726
[[package]]
28-
name = "ahash"
29-
version = "0.7.6"
27+
name = "adler"
28+
version = "1.0.2"
3029
source = "registry+https://github.com/rust-lang/crates.io-index"
31-
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
30+
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
3231
dependencies = [
33-
"getrandom",
34-
"once_cell",
35-
"version_check",
32+
"compiler_builtins",
33+
"rustc-std-workspace-core",
3634
]
3735

3836
[[package]]
@@ -178,11 +176,11 @@ dependencies = [
178176

179177
[[package]]
180178
name = "ar_archive_writer"
181-
version = "0.1.4"
179+
version = "0.1.5"
182180
source = "registry+https://github.com/rust-lang/crates.io-index"
183-
checksum = "74cfb39880a59e122232cb5fb06b20b4382d58c12fa9747d16f846d38a7b094c"
181+
checksum = "9792d37ca5173d7e7f4fe453739a0671d0557915a030a383d6b866476bbc3e71"
184182
dependencies = [
185-
"object",
183+
"object 0.32.0",
186184
]
187185

188186
[[package]]
@@ -252,12 +250,12 @@ version = "0.3.68"
252250
source = "registry+https://github.com/rust-lang/crates.io-index"
253251
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
254252
dependencies = [
255-
"addr2line",
253+
"addr2line 0.20.0",
256254
"cc",
257255
"cfg-if",
258256
"libc",
259257
"miniz_oxide",
260-
"object",
258+
"object 0.31.1",
261259
"rustc-demangle",
262260
]
263261

@@ -1159,9 +1157,9 @@ dependencies = [
11591157

11601158
[[package]]
11611159
name = "fallible-iterator"
1162-
version = "0.2.0"
1160+
version = "0.3.0"
11631161
source = "registry+https://github.com/rust-lang/crates.io-index"
1164-
checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
1162+
checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
11651163

11661164
[[package]]
11671165
name = "fastrand"
@@ -1439,24 +1437,22 @@ dependencies = [
14391437

14401438
[[package]]
14411439
name = "gimli"
1442-
version = "0.26.2"
1440+
version = "0.27.3"
14431441
source = "registry+https://github.com/rust-lang/crates.io-index"
1444-
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
1445-
dependencies = [
1446-
"fallible-iterator",
1447-
"indexmap 1.9.3",
1448-
"stable_deref_trait",
1449-
]
1442+
checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
14501443

14511444
[[package]]
14521445
name = "gimli"
1453-
version = "0.27.3"
1446+
version = "0.28.0"
14541447
source = "registry+https://github.com/rust-lang/crates.io-index"
1455-
checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
1448+
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
14561449
dependencies = [
14571450
"compiler_builtins",
1451+
"fallible-iterator",
1452+
"indexmap 2.0.0",
14581453
"rustc-std-workspace-alloc",
14591454
"rustc-std-workspace-core",
1455+
"stable_deref_trait",
14601456
]
14611457

14621458
[[package]]
@@ -1525,25 +1521,14 @@ name = "hashbrown"
15251521
version = "0.12.3"
15261522
source = "registry+https://github.com/rust-lang/crates.io-index"
15271523
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1528-
dependencies = [
1529-
"ahash 0.7.6",
1530-
]
1531-
1532-
[[package]]
1533-
name = "hashbrown"
1534-
version = "0.13.2"
1535-
source = "registry+https://github.com/rust-lang/crates.io-index"
1536-
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
1537-
dependencies = [
1538-
"ahash 0.8.3",
1539-
]
15401524

15411525
[[package]]
15421526
name = "hashbrown"
15431527
version = "0.14.0"
15441528
source = "registry+https://github.com/rust-lang/crates.io-index"
15451529
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
15461530
dependencies = [
1531+
"ahash",
15471532
"allocator-api2",
15481533
"compiler_builtins",
15491534
"rustc-std-workspace-alloc",
@@ -2449,12 +2434,21 @@ name = "object"
24492434
version = "0.31.1"
24502435
source = "registry+https://github.com/rust-lang/crates.io-index"
24512436
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
2437+
dependencies = [
2438+
"memchr",
2439+
]
2440+
2441+
[[package]]
2442+
name = "object"
2443+
version = "0.32.0"
2444+
source = "registry+https://github.com/rust-lang/crates.io-index"
2445+
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
24522446
dependencies = [
24532447
"compiler_builtins",
24542448
"crc32fast",
24552449
"flate2",
2456-
"hashbrown 0.13.2",
2457-
"indexmap 1.9.3",
2450+
"hashbrown 0.14.0",
2451+
"indexmap 2.0.0",
24582452
"memchr",
24592453
"rustc-std-workspace-alloc",
24602454
"rustc-std-workspace-core",
@@ -3362,7 +3356,7 @@ dependencies = [
33623356
"cstr",
33633357
"libc",
33643358
"measureme",
3365-
"object",
3359+
"object 0.32.0",
33663360
"rustc-demangle",
33673361
"rustc_ast",
33683362
"rustc_attr",
@@ -3398,7 +3392,7 @@ dependencies = [
33983392
"itertools",
33993393
"jobserver",
34003394
"libc",
3401-
"object",
3395+
"object 0.32.0",
34023396
"pathdiff",
34033397
"regex",
34043398
"rustc_arena",
@@ -4332,7 +4326,7 @@ name = "rustc_target"
43324326
version = "0.0.0"
43334327
dependencies = [
43344328
"bitflags 1.3.2",
4335-
"object",
4329+
"object 0.32.0",
43364330
"rustc_abi",
43374331
"rustc_data_structures",
43384332
"rustc_feature",
@@ -4587,12 +4581,12 @@ checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
45874581

45884582
[[package]]
45894583
name = "ruzstd"
4590-
version = "0.3.1"
4584+
version = "0.4.0"
45914585
source = "registry+https://github.com/rust-lang/crates.io-index"
4592-
checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe"
4586+
checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
45934587
dependencies = [
45944588
"byteorder",
4595-
"thiserror",
4589+
"thiserror-core",
45964590
"twox-hash",
45974591
]
45984592

@@ -4861,7 +4855,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
48614855
name = "std"
48624856
version = "0.0.0"
48634857
dependencies = [
4864-
"addr2line",
4858+
"addr2line 0.21.0",
48654859
"alloc",
48664860
"cfg-if",
48674861
"compiler_builtins",
@@ -4872,7 +4866,7 @@ dependencies = [
48724866
"hermit-abi 0.3.2",
48734867
"libc",
48744868
"miniz_oxide",
4875-
"object",
4869+
"object 0.32.0",
48764870
"panic_abort",
48774871
"panic_unwind",
48784872
"profiler_builtins",
@@ -5139,6 +5133,26 @@ dependencies = [
51395133
"thiserror-impl",
51405134
]
51415135

5136+
[[package]]
5137+
name = "thiserror-core"
5138+
version = "1.0.38"
5139+
source = "registry+https://github.com/rust-lang/crates.io-index"
5140+
checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
5141+
dependencies = [
5142+
"thiserror-core-impl",
5143+
]
5144+
5145+
[[package]]
5146+
name = "thiserror-core-impl"
5147+
version = "1.0.38"
5148+
source = "registry+https://github.com/rust-lang/crates.io-index"
5149+
checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
5150+
dependencies = [
5151+
"proc-macro2",
5152+
"quote",
5153+
"syn 1.0.109",
5154+
]
5155+
51425156
[[package]]
51435157
name = "thiserror-impl"
51445158
version = "1.0.40"
@@ -5152,13 +5166,13 @@ dependencies = [
51525166

51535167
[[package]]
51545168
name = "thorin-dwp"
5155-
version = "0.6.0"
5169+
version = "0.7.0"
51565170
source = "registry+https://github.com/rust-lang/crates.io-index"
5157-
checksum = "98c040e1340b889d4180c64e1d787efa9c32cb1617757e101480b61238b0d927"
5171+
checksum = "4db52ee8fec06e119b692ef3dd2c4cf621a99204c1b8c47407870ed050305b9b"
51585172
dependencies = [
5159-
"gimli 0.26.2",
5160-
"hashbrown 0.12.3",
5161-
"object",
5173+
"gimli 0.28.0",
5174+
"hashbrown 0.14.0",
5175+
"object 0.32.0",
51625176
"tracing",
51635177
]
51645178

‎compiler/rustc_codegen_cranelift/Cargo.lock

+31-7
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ dependencies = [
7171
"cranelift-control",
7272
"cranelift-entity",
7373
"cranelift-isle",
74-
"gimli",
74+
"gimli 0.27.2",
7575
"hashbrown 0.13.2",
7676
"log",
7777
"regalloc2",
@@ -180,7 +180,7 @@ dependencies = [
180180
"cranelift-control",
181181
"cranelift-module",
182182
"log",
183-
"object",
183+
"object 0.30.4",
184184
"target-lexicon",
185185
]
186186

@@ -195,9 +195,9 @@ dependencies = [
195195

196196
[[package]]
197197
name = "equivalent"
198-
version = "1.0.0"
198+
version = "1.0.1"
199199
source = "registry+https://github.com/rust-lang/crates.io-index"
200-
checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
200+
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
201201

202202
[[package]]
203203
name = "fallible-iterator"
@@ -216,6 +216,15 @@ dependencies = [
216216
"stable_deref_trait",
217217
]
218218

219+
[[package]]
220+
name = "gimli"
221+
version = "0.28.0"
222+
source = "registry+https://github.com/rust-lang/crates.io-index"
223+
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
224+
dependencies = [
225+
"indexmap 2.0.0",
226+
]
227+
219228
[[package]]
220229
name = "hashbrown"
221230
version = "0.12.3"
@@ -236,6 +245,9 @@ name = "hashbrown"
236245
version = "0.14.0"
237246
source = "registry+https://github.com/rust-lang/crates.io-index"
238247
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
248+
dependencies = [
249+
"ahash",
250+
]
239251

240252
[[package]]
241253
name = "indexmap"
@@ -309,6 +321,18 @@ dependencies = [
309321
"memchr",
310322
]
311323

324+
[[package]]
325+
name = "object"
326+
version = "0.32.0"
327+
source = "registry+https://github.com/rust-lang/crates.io-index"
328+
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
329+
dependencies = [
330+
"crc32fast",
331+
"hashbrown 0.14.0",
332+
"indexmap 2.0.0",
333+
"memchr",
334+
]
335+
312336
[[package]]
313337
name = "once_cell"
314338
version = "1.16.0"
@@ -356,10 +380,10 @@ dependencies = [
356380
"cranelift-module",
357381
"cranelift-native",
358382
"cranelift-object",
359-
"gimli",
360-
"indexmap 2.0.0",
383+
"gimli 0.28.0",
384+
"indexmap 1.9.3",
361385
"libloading",
362-
"object",
386+
"object 0.32.0",
363387
"smallvec",
364388
"target-lexicon",
365389
]

‎compiler/rustc_codegen_cranelift/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ cranelift-native = { version = "0.98" }
1515
cranelift-jit = { version = "0.98", optional = true }
1616
cranelift-object = { version = "0.98" }
1717
target-lexicon = "0.12.0"
18-
gimli = { version = "0.27.2", default-features = false, features = ["write"]}
19-
object = { version = "0.30.3", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
18+
gimli = { version = "0.28.0", default-features = false, features = ["write"]}
19+
object = { version = "0.32.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
2020

2121
indexmap = "2.0.0"
2222
libloading = { version = "0.7.3", optional = true }

‎compiler/rustc_codegen_llvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ bitflags = "1.0"
1111
cstr = "0.2"
1212
libc = "0.2"
1313
measureme = "10.0.0"
14-
object = { version = "0.31.1", default-features = false, features = [
14+
object = { version = "0.32.0", default-features = false, features = [
1515
"std",
1616
"read",
1717
] }

‎compiler/rustc_codegen_ssa/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
ar_archive_writer = "0.1.3"
7+
ar_archive_writer = "0.1.5"
88
bitflags = "1.2.1"
99
cc = "1.0.69"
1010
itertools = "0.10.1"
1111
tracing = "0.1"
1212
jobserver = "0.1.22"
1313
tempfile = "3.2"
14-
thorin-dwp = "0.6"
14+
thorin-dwp = "0.7"
1515
pathdiff = "0.2.0"
1616
serde_json = "1.0.59"
1717
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
@@ -42,7 +42,7 @@ rustc_session = { path = "../rustc_session" }
4242
libc = "0.2.50"
4343

4444
[dependencies.object]
45-
version = "0.31.1"
45+
version = "0.32.0"
4646
default-features = false
4747
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"]
4848

‎compiler/rustc_target/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ rustc_serialize = { path = "../rustc_serialize" }
1616
rustc_span = { path = "../rustc_span" }
1717

1818
[dependencies.object]
19-
version = "0.31.1"
19+
version = "0.32.0"
2020
default-features = false
2121
features = ["elf"]

‎library/std/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
2929

3030
[target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]
3131
miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
32-
addr2line = { version = "0.20.0", optional = true, default-features = false }
33-
object = { version = "0.31.1", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] }
32+
addr2line = { version = "0.21.0", optional = true, default-features = false }
33+
object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] }
3434

3535
[dev-dependencies]
3636
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }

‎src/bootstrap/Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change

‎src/bootstrap/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ filetime = "0.2"
3636
cc = "1.0.69"
3737
libc = "0.2"
3838
hex = "0.4"
39-
object = { version = "0.31.1", default-features = false, features = ["archive", "coff", "read_core", "unaligned"] }
39+
object = { version = "0.32.0", default-features = false, features = ["archive", "coff", "read_core", "unaligned"] }
4040
serde = "1.0.137"
4141
# Directly use serde_derive rather than through the derive feature of serde to allow building both
4242
# in parallel and to allow serde_json and toml to start building as soon as serde has been built.

‎src/bootstrap/llvm.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,7 @@ impl Step for Llvm {
374374
cfg.define("LLVM_LINK_LLVM_DYLIB", "ON");
375375
}
376376

377-
if (target.starts_with("riscv")
378-
|| target.starts_with("csky"))
377+
if (target.starts_with("riscv") || target.starts_with("csky"))
379378
&& !target.contains("freebsd")
380379
&& !target.contains("openbsd")
381380
&& !target.contains("netbsd")

‎src/tools/rust-analyzer/crates/proc-macro-api/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rust-version.workspace = true
1212
doctest = false
1313

1414
[dependencies]
15-
object = { version = "0.31.0", default-features = false, features = [
15+
object = { version = "0.32.0", default-features = false, features = [
1616
"std",
1717
"read_core",
1818
"elf",

‎src/tools/rust-analyzer/crates/proc-macro-srv/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rust-version.workspace = true
1212
doctest = false
1313

1414
[dependencies]
15-
object = { version = "0.31.0", default-features = false, features = [
15+
object = { version = "0.32.0", default-features = false, features = [
1616
"std",
1717
"read_core",
1818
"elf",

‎src/tools/tidy/src/deps.rs

+2
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
258258
"termize",
259259
"thin-vec",
260260
"thiserror",
261+
"thiserror-core",
262+
"thiserror-core-impl",
261263
"thiserror-impl",
262264
"thorin-dwp",
263265
"thread_local",

0 commit comments

Comments
 (0)
Please sign in to comment.