Skip to content

Commit c102d11

Browse files
committed
Upgrade std to gimli 0.28.0
1 parent 8c60295 commit c102d11

File tree

4 files changed

+48
-15
lines changed

4 files changed

+48
-15
lines changed

Cargo.lock

+36-12
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,17 @@ 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",
12+
]
13+
14+
[[package]]
15+
name = "addr2line"
16+
version = "0.21.0"
17+
source = "registry+https://github.com/rust-lang/crates.io-index"
18+
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
19+
dependencies = [
20+
"compiler_builtins",
21+
"gimli 0.28.0",
1322
"rustc-std-workspace-alloc",
1423
"rustc-std-workspace-core",
1524
]
@@ -179,7 +188,7 @@ version = "0.1.4"
179188
source = "registry+https://github.com/rust-lang/crates.io-index"
180189
checksum = "74cfb39880a59e122232cb5fb06b20b4382d58c12fa9747d16f846d38a7b094c"
181190
dependencies = [
182-
"object",
191+
"object 0.31.1",
183192
]
184193

185194
[[package]]
@@ -249,12 +258,12 @@ version = "0.3.68"
249258
source = "registry+https://github.com/rust-lang/crates.io-index"
250259
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
251260
dependencies = [
252-
"addr2line",
261+
"addr2line 0.20.0",
253262
"cc",
254263
"cfg-if",
255264
"libc",
256265
"miniz_oxide",
257-
"object",
266+
"object 0.31.1",
258267
"rustc-demangle",
259268
]
260269

@@ -1362,6 +1371,12 @@ name = "gimli"
13621371
version = "0.27.3"
13631372
source = "registry+https://github.com/rust-lang/crates.io-index"
13641373
checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
1374+
1375+
[[package]]
1376+
name = "gimli"
1377+
version = "0.28.0"
1378+
source = "registry+https://github.com/rust-lang/crates.io-index"
1379+
checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
13651380
dependencies = [
13661381
"compiler_builtins",
13671382
"rustc-std-workspace-alloc",
@@ -2204,15 +2219,24 @@ version = "0.31.1"
22042219
source = "registry+https://github.com/rust-lang/crates.io-index"
22052220
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
22062221
dependencies = [
2207-
"compiler_builtins",
22082222
"crc32fast",
22092223
"flate2",
22102224
"hashbrown 0.13.2",
22112225
"indexmap 1.9.3",
22122226
"memchr",
2227+
"ruzstd",
2228+
]
2229+
2230+
[[package]]
2231+
name = "object"
2232+
version = "0.32.0"
2233+
source = "registry+https://github.com/rust-lang/crates.io-index"
2234+
checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
2235+
dependencies = [
2236+
"compiler_builtins",
2237+
"memchr",
22132238
"rustc-std-workspace-alloc",
22142239
"rustc-std-workspace-core",
2215-
"ruzstd",
22162240
]
22172241

22182242
[[package]]
@@ -3029,7 +3053,7 @@ dependencies = [
30293053
"cstr",
30303054
"libc",
30313055
"measureme",
3032-
"object",
3056+
"object 0.31.1",
30333057
"rustc-demangle",
30343058
"rustc_ast",
30353059
"rustc_attr",
@@ -3065,7 +3089,7 @@ dependencies = [
30653089
"itertools",
30663090
"jobserver",
30673091
"libc",
3068-
"object",
3092+
"object 0.31.1",
30693093
"pathdiff",
30703094
"regex",
30713095
"rustc_arena",
@@ -3996,7 +4020,7 @@ name = "rustc_target"
39964020
version = "0.0.0"
39974021
dependencies = [
39984022
"bitflags 1.3.2",
3999-
"object",
4023+
"object 0.31.1",
40004024
"rustc_abi",
40014025
"rustc_data_structures",
40024026
"rustc_feature",
@@ -4490,7 +4514,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
44904514
name = "std"
44914515
version = "0.0.0"
44924516
dependencies = [
4493-
"addr2line",
4517+
"addr2line 0.21.0",
44944518
"alloc",
44954519
"cfg-if",
44964520
"compiler_builtins",
@@ -4501,7 +4525,7 @@ dependencies = [
45014525
"hermit-abi 0.3.1",
45024526
"libc",
45034527
"miniz_oxide",
4504-
"object",
4528+
"object 0.32.0",
45054529
"panic_abort",
45064530
"panic_unwind",
45074531
"profiler_builtins",
@@ -4773,7 +4797,7 @@ checksum = "98c040e1340b889d4180c64e1d787efa9c32cb1617757e101480b61238b0d927"
47734797
dependencies = [
47744798
"gimli 0.26.2",
47754799
"hashbrown 0.12.3",
4776-
"object",
4800+
"object 0.31.1",
47774801
"tracing",
47784802
]
47794803

library/std/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep
2525
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
2626

2727
# Dependencies of the `backtrace` crate
28-
addr2line = { version = "0.20.0", optional = true, default-features = false }
28+
addr2line = { version = "0.21.0", optional = true, default-features = false }
2929
rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
3030
miniz_oxide = { version = "0.7.0", optional = true, default-features = false, public = false }
3131
[dependencies.object]
32-
version = "0.31.1"
32+
version = "0.32.0"
3333
optional = true
3434
default-features = false
3535
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// check-pass
2+
3+
// This intends to use the unsizing coercion from array to slice, but it only
4+
// works if we resolve `<&[u8]>::from` as the reflexive `From<T> for T`. In
5+
// #113238, we found that gimli had added its own `From<EndianSlice> for &[u8]`
6+
// that affected all `std/backtrace` users.
7+
fn main() {
8+
let _ = <&[u8]>::from(&[]);
9+
}

tests/ui/suggestions/issue-71394-no-from-impl.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LL | let _: &[i8] = data.into();
1313
<[T; 4] as From<(T, T, T, T)>>
1414
<[T; 5] as From<(T, T, T, T, T)>>
1515
<[T; 6] as From<(T, T, T, T, T, T)>>
16-
and 7 others
16+
and 6 others
1717
= note: required for `&[u8]` to implement `Into<&[i8]>`
1818

1919
error: aborting due to previous error

0 commit comments

Comments
 (0)