Skip to content

Commit b6cd765

Browse files
authored
Rollup merge of #143257 - tgross35:run-make-deps, r=jieyouxu
Upgrade dependencies in run-make-support The main purpose of this is to upgrade `object` and `gimli`, which will allow us to drop outdated versions once backtrace also updates. The only semver breakage in `object`'s is in `elf::R_RISCV_GNU_*` and `pe::IMAGE_WEAK_EXTERN_*` constants, as well as Mach-O dyld, which don't appear to be used here. `gimli` is similar, there is only minor breakage related to dyld. These version upgrades were also done in the library. `bstr`, `similar`, and `regex` are also upgraded to the latest minor version here to match what the lockfile already uses. The `regex` comment about `memchr` version hasn't been relevant to this lockfile since e95d15a ("Pin memchr to 2.5.0 in the library rather than rustc_ast") and is no longer relevant in the library lockfile either. Object Changelog: https://github.com/gimli-rs/object/blob/master/CHANGELOG.md#0370 Gimli changelog: https://github.com/gimli-rs/gimli/blob/master/CHANGELOG.md#0320
2 parents cfe1942 + 18a621a commit b6cd765

File tree

2 files changed

+41
-13
lines changed

2 files changed

+41
-13
lines changed

Cargo.lock

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version = "0.24.2"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
99
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
1010
dependencies = [
11-
"gimli",
11+
"gimli 0.31.1",
1212
]
1313

1414
[[package]]
@@ -1483,6 +1483,17 @@ dependencies = [
14831483
"stable_deref_trait",
14841484
]
14851485

1486+
[[package]]
1487+
name = "gimli"
1488+
version = "0.32.0"
1489+
source = "registry+https://github.com/rust-lang/crates.io-index"
1490+
checksum = "93563d740bc9ef04104f9ed6f86f1e3275c2cdafb95664e26584b9ca807a8ffe"
1491+
dependencies = [
1492+
"fallible-iterator",
1493+
"indexmap",
1494+
"stable_deref_trait",
1495+
]
1496+
14861497
[[package]]
14871498
name = "glob"
14881499
version = "0.3.2"
@@ -2568,7 +2579,7 @@ dependencies = [
25682579
"hashbrown",
25692580
"indexmap",
25702581
"memchr",
2571-
"ruzstd",
2582+
"ruzstd 0.7.3",
25722583
]
25732584

25742585
[[package]]
@@ -2578,9 +2589,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
25782589
checksum = "03fd943161069e1768b4b3d050890ba48730e590f57e56d4aa04e7e090e61b4a"
25792590
dependencies = [
25802591
"crc32fast",
2592+
"flate2",
25812593
"hashbrown",
25822594
"indexmap",
25832595
"memchr",
2596+
"ruzstd 0.8.1",
25842597
"wasmparser 0.234.0",
25852598
]
25862599

@@ -3194,9 +3207,9 @@ version = "0.2.0"
31943207
dependencies = [
31953208
"bstr",
31963209
"build_helper",
3197-
"gimli",
3210+
"gimli 0.32.0",
31983211
"libc",
3199-
"object 0.36.7",
3212+
"object 0.37.1",
32003213
"regex",
32013214
"serde_json",
32023215
"similar",
@@ -3498,7 +3511,7 @@ name = "rustc_codegen_llvm"
34983511
version = "0.0.0"
34993512
dependencies = [
35003513
"bitflags",
3501-
"gimli",
3514+
"gimli 0.31.1",
35023515
"itertools",
35033516
"libc",
35043517
"measureme",
@@ -4473,7 +4486,7 @@ dependencies = [
44734486
"rustc_target",
44744487
"rustc_trait_selection",
44754488
"tracing",
4476-
"twox-hash",
4489+
"twox-hash 1.6.3",
44774490
]
44784491

44794492
[[package]]
@@ -4857,7 +4870,16 @@ version = "0.7.3"
48574870
source = "registry+https://github.com/rust-lang/crates.io-index"
48584871
checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f"
48594872
dependencies = [
4860-
"twox-hash",
4873+
"twox-hash 1.6.3",
4874+
]
4875+
4876+
[[package]]
4877+
name = "ruzstd"
4878+
version = "0.8.1"
4879+
source = "registry+https://github.com/rust-lang/crates.io-index"
4880+
checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c"
4881+
dependencies = [
4882+
"twox-hash 2.1.1",
48614883
]
48624884

48634885
[[package]]
@@ -5338,7 +5360,7 @@ version = "0.9.0"
53385360
source = "registry+https://github.com/rust-lang/crates.io-index"
53395361
checksum = "9e9c1e705f82a260173f3eec93f2ff6d7807f23ad5a8cc2e7316a891733ea7a1"
53405362
dependencies = [
5341-
"gimli",
5363+
"gimli 0.31.1",
53425364
"hashbrown",
53435365
"object 0.36.7",
53445366
"tracing",
@@ -5580,6 +5602,12 @@ dependencies = [
55805602
"static_assertions",
55815603
]
55825604

5605+
[[package]]
5606+
name = "twox-hash"
5607+
version = "2.1.1"
5608+
source = "registry+https://github.com/rust-lang/crates.io-index"
5609+
checksum = "8b907da542cbced5261bd3256de1b3a1bf340a3d37f93425a07362a1d687de56"
5610+
55835611
[[package]]
55845612
name = "type-map"
55855613
version = "0.5.1"

src/tools/run-make-support/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ version = "0.2.0"
44
edition = "2021"
55

66
[dependencies]
7-
bstr = "1.6.0"
8-
object = "0.36.2"
9-
similar = "2.5.0"
7+
bstr = "1.12"
8+
object = "0.37"
9+
similar = "2.7"
1010
wasmparser = { version = "0.219", default-features = false, features = ["std"] }
11-
regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace
12-
gimli = "0.31.0"
11+
regex = "1.11"
12+
gimli = "0.32"
1313
build_helper = { path = "../../build_helper" }
1414
serde_json = "1.0"
1515
libc = "0.2"

0 commit comments

Comments
 (0)