Skip to content

Commit c35a96f

Browse files
Mark-Simulacrumxobs
authored andcommitted
Downgrade addr2line
This prevents rust-lang#113238 from hitting stable while we sort out options for avoiding it. The downgrade is expected to not affect any users on stable, since it primarily affects tier 3 targets.
1 parent c9b147c commit c35a96f

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

Cargo.lock

+17-10
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,25 @@ version = 3
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.19.0"
7+
version = "0.18.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
9+
checksum = "6ca9b76e919fd83ccfb509f51b28c333c0e03f2221616e347a129215cec4e4a9"
1010
dependencies = [
1111
"compiler_builtins",
12-
"gimli 0.27.2",
12+
"gimli 0.26.2",
1313
"rustc-std-workspace-alloc",
1414
"rustc-std-workspace-core",
1515
]
1616

17+
[[package]]
18+
name = "addr2line"
19+
version = "0.19.0"
20+
source = "registry+https://github.com/rust-lang/crates.io-index"
21+
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
22+
dependencies = [
23+
"gimli 0.27.2",
24+
]
25+
1726
[[package]]
1827
name = "adler"
1928
version = "1.0.2"
@@ -228,7 +237,7 @@ version = "0.3.67"
228237
source = "registry+https://github.com/rust-lang/crates.io-index"
229238
checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
230239
dependencies = [
231-
"addr2line",
240+
"addr2line 0.19.0",
232241
"cc",
233242
"cfg-if",
234243
"libc",
@@ -1524,8 +1533,11 @@ version = "0.26.2"
15241533
source = "registry+https://github.com/rust-lang/crates.io-index"
15251534
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
15261535
dependencies = [
1536+
"compiler_builtins",
15271537
"fallible-iterator",
15281538
"indexmap",
1539+
"rustc-std-workspace-alloc",
1540+
"rustc-std-workspace-core",
15291541
"stable_deref_trait",
15301542
]
15311543

@@ -1534,11 +1546,6 @@ name = "gimli"
15341546
version = "0.27.2"
15351547
source = "registry+https://github.com/rust-lang/crates.io-index"
15361548
checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
1537-
dependencies = [
1538-
"compiler_builtins",
1539-
"rustc-std-workspace-alloc",
1540-
"rustc-std-workspace-core",
1541-
]
15421549

15431550
[[package]]
15441551
name = "glob"
@@ -4718,7 +4725,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
47184725
name = "std"
47194726
version = "0.0.0"
47204727
dependencies = [
4721-
"addr2line",
4728+
"addr2line 0.18.0",
47224729
"alloc",
47234730
"cfg-if",
47244731
"compiler_builtins",

library/std/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ hashbrown = { version = "0.13", default-features = false, features = ['rustc-dep
2323
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
2424

2525
# Dependencies of the `backtrace` crate
26-
addr2line = { version = "0.19.0", optional = true, default-features = false }
26+
addr2line = { version = "0.18.0", optional = true, default-features = false }
2727
rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
2828
miniz_oxide = { version = "0.6.0", optional = true, default-features = false }
2929
[dependencies.object]

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ LL | let _: &[i8] = data.into();
55
| ^^^^ the trait `From<&[u8]>` is not implemented for `&[i8]`
66
|
77
= help: the following other types implement trait `From<T>`:
8-
<&'input [u8] as From<gimli::read::endian_slice::EndianSlice<'input, Endian>>>
98
<[T; 10] as From<(T, T, T, T, T, T, T, T, T, T)>>
109
<[T; 11] as From<(T, T, T, T, T, T, T, T, T, T, T)>>
1110
<[T; 12] as From<(T, T, T, T, T, T, T, T, T, T, T, T)>>
1211
<[T; 1] as From<(T,)>>
1312
<[T; 2] as From<(T, T)>>
1413
<[T; 3] as From<(T, T, T)>>
1514
<[T; 4] as From<(T, T, T, T)>>
16-
and 7 others
15+
<[T; 5] as From<(T, T, T, T, T)>>
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)