diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-07-16 18:09:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-16 18:09:11 +0200 |
| commit | 2876b1bb881760b1a70995be1b83666d45511be7 (patch) | |
| tree | dab74fc51486a41680a11b3090b6e14b6e660262 | |
| parent | 08809eb746f62791c658cc8bc98151422d292464 (diff) | |
| parent | 664907cab68408a2a67c70d5f6864f558840b119 (diff) | |
| download | rust-2876b1bb881760b1a70995be1b83666d45511be7.tar.gz rust-2876b1bb881760b1a70995be1b83666d45511be7.zip | |
Rollup merge of #127805 - Mrmaxmeier:run-make-bump-gimli, r=jieyouxu
run-make-support: update gimli to 0.31.0 This version bump is required for the tests in #126985 as suggested [here](https://github.com/rust-lang/rust/pull/126985#issuecomment-2196745112). r? tgross35 (^ that didn't work. cc `@tgross35)` try-job: x86_64-msvc try-job: x86_64-mingw try-job: aarch64-apple try-job: test-various try-job: armhf-gnu try-job: dist-x86_64-linux
| -rw-r--r-- | Cargo.lock | 13 | ||||
| -rw-r--r-- | src/tools/run-make-support/Cargo.toml | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index cafc623c185..68478d55e23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1619,6 +1619,17 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +dependencies = [ + "fallible-iterator", + "indexmap", + "stable_deref_trait", +] + +[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3421,7 +3432,7 @@ dependencies = [ "ar", "bstr", "build_helper", - "gimli 0.28.1", + "gimli 0.31.0", "object 0.34.0", "regex", "similar", diff --git a/src/tools/run-make-support/Cargo.toml b/src/tools/run-make-support/Cargo.toml index 969552dec84..681284b1a48 100644 --- a/src/tools/run-make-support/Cargo.toml +++ b/src/tools/run-make-support/Cargo.toml @@ -9,7 +9,7 @@ object = "0.34.0" similar = "2.5.0" wasmparser = "0.118.2" regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace -gimli = "0.28.1" +gimli = "0.31.0" ar = "0.9.0" build_helper = { path = "../build_helper" } |