Skip to content

Commit 165cdda

Browse files
borsbors
committed
Auto merge of rust-lang#111989 - klensy:deps-up-26-05-23, r=Mark-Simulacrum
deps: bump crates Updates few deps: drops a lot of cxx* crates: ```console $ cargo update -p iana-time-zone-haiku Updating crates.io index Updating cc v1.0.77 -> v1.0.79 Removing codespan-reporting v0.11.1 Removing cxx v1.0.94 Removing cxx-build v1.0.94 Removing cxxbridge-flags v1.0.94 Removing cxxbridge-macro v1.0.94 Updating iana-time-zone-haiku v0.1.1 -> v0.1.2 Removing link-cplusplus v1.0.8 Removing scratch v1.0.5 ``` cc: https://github.com/rust-lang/cc-rs/releases/tag/1.0.78, https://github.com/rust-lang/cc-rs/releases/tag/1.0.79 iana-time-zone-haiku: https://github.com/strawlab/iana-time-zone/releases/tag/haiku%2Fv0.1.2 fixed crossbeam-rs/crossbeam#972 (similar fixed in rust repo rust-lang#110089) ```console $ cargo update -p crossbeam-channel Updating crates.io index Updating crossbeam-channel v0.5.6 -> v0.5.8 ``` https://github.com/crossbeam-rs/crossbeam/blob/master/crossbeam-channel/CHANGELOG.md#version-058 dedupes memoffset versions: ```console $ cargo update -p crossbeam-epoch Updating crates.io index Updating crossbeam-epoch v0.9.13 -> v0.9.14 Removing memoffset v0.7.1 ``` https://github.com/crossbeam-rs/crossbeam/blob/master/crossbeam-epoch/CHANGELOG.md#version-0914 Gilnaa/memoffset@v0.6.5...v0.8.0 rust-lang#108638 (comment) dedupes bstr versions ```console $ cargo update -p ignore -p opener Updating crates.io index Removing bstr v0.2.17 Updating globset v0.4.9 -> v0.4.10 Updating ignore v0.4.18 -> v0.4.20 Updating opener v0.5.0 -> v0.5.2 ``` globset BurntSushi/ripgrep@ac8fecb ignore https://github.com/BurntSushi/ripgrep/commits/master/crates/ignore hard to track, but drop dep on crossbeam-utils (BurntSushi/ripgrep@e95254a), don't stat git if require_git is false (BurntSushi/ripgrep@009dda1) and added bunch of formats to ignore list opener Seeker14491/opener@v0.5.0...v0.5.2 nothing interesting
2 parents d9a4d5e + 9b6a6b1 commit 165cdda

File tree

3 files changed

+22
-123
lines changed

3 files changed

+22
-123
lines changed

‎Cargo.lock

+21-121
Original file line numberDiff line numberDiff line change
@@ -270,17 +270,6 @@ dependencies = [
270270
"generic-array",
271271
]
272272

273-
[[package]]
274-
name = "bstr"
275-
version = "0.2.17"
276-
source = "registry+https://github.com/rust-lang/crates.io-index"
277-
checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
278-
dependencies = [
279-
"lazy_static",
280-
"memchr",
281-
"regex-automata 0.1.10",
282-
]
283-
284273
[[package]]
285274
name = "bstr"
286275
version = "1.3.0"
@@ -417,9 +406,9 @@ version = "0.1.0"
417406

418407
[[package]]
419408
name = "cc"
420-
version = "1.0.77"
409+
version = "1.0.79"
421410
source = "registry+https://github.com/rust-lang/crates.io-index"
422-
checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
411+
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
423412

424413
[[package]]
425414
name = "cfg-if"
@@ -666,16 +655,6 @@ dependencies = [
666655
"rustc-semver",
667656
]
668657

669-
[[package]]
670-
name = "codespan-reporting"
671-
version = "0.11.1"
672-
source = "registry+https://github.com/rust-lang/crates.io-index"
673-
checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
674-
dependencies = [
675-
"termcolor",
676-
"unicode-width",
677-
]
678-
679658
[[package]]
680659
name = "collect-license-metadata"
681660
version = "0.1.0"
@@ -842,9 +821,9 @@ dependencies = [
842821

843822
[[package]]
844823
name = "crossbeam-channel"
845-
version = "0.5.6"
824+
version = "0.5.8"
846825
source = "registry+https://github.com/rust-lang/crates.io-index"
847-
checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
826+
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
848827
dependencies = [
849828
"cfg-if",
850829
"crossbeam-utils",
@@ -863,14 +842,14 @@ dependencies = [
863842

864843
[[package]]
865844
name = "crossbeam-epoch"
866-
version = "0.9.13"
845+
version = "0.9.14"
867846
source = "registry+https://github.com/rust-lang/crates.io-index"
868-
checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
847+
checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"
869848
dependencies = [
870849
"autocfg",
871850
"cfg-if",
872851
"crossbeam-utils",
873-
"memoffset 0.7.1",
852+
"memoffset",
874853
"scopeguard",
875854
]
876855

@@ -943,50 +922,6 @@ dependencies = [
943922
"winapi",
944923
]
945924

946-
[[package]]
947-
name = "cxx"
948-
version = "1.0.94"
949-
source = "registry+https://github.com/rust-lang/crates.io-index"
950-
checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
951-
dependencies = [
952-
"cc",
953-
"cxxbridge-flags",
954-
"cxxbridge-macro",
955-
"link-cplusplus",
956-
]
957-
958-
[[package]]
959-
name = "cxx-build"
960-
version = "1.0.94"
961-
source = "registry+https://github.com/rust-lang/crates.io-index"
962-
checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
963-
dependencies = [
964-
"cc",
965-
"codespan-reporting",
966-
"once_cell",
967-
"proc-macro2",
968-
"quote",
969-
"scratch",
970-
"syn 2.0.8",
971-
]
972-
973-
[[package]]
974-
name = "cxxbridge-flags"
975-
version = "1.0.94"
976-
source = "registry+https://github.com/rust-lang/crates.io-index"
977-
checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
978-
979-
[[package]]
980-
name = "cxxbridge-macro"
981-
version = "1.0.94"
982-
source = "registry+https://github.com/rust-lang/crates.io-index"
983-
checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
984-
dependencies = [
985-
"proc-macro2",
986-
"quote",
987-
"syn 2.0.8",
988-
]
989-
990925
[[package]]
991926
name = "datafrog"
992927
version = "2.0.1"
@@ -1273,7 +1208,7 @@ version = "0.3.5"
12731208
source = "registry+https://github.com/rust-lang/crates.io-index"
12741209
checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535"
12751210
dependencies = [
1276-
"memoffset 0.8.0",
1211+
"memoffset",
12771212
"rustc_version",
12781213
]
12791214

@@ -1548,12 +1483,12 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
15481483

15491484
[[package]]
15501485
name = "globset"
1551-
version = "0.4.9"
1486+
version = "0.4.10"
15521487
source = "registry+https://github.com/rust-lang/crates.io-index"
1553-
checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
1488+
checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
15541489
dependencies = [
15551490
"aho-corasick",
1556-
"bstr 0.2.17",
1491+
"bstr",
15571492
"fnv",
15581493
"log",
15591494
"regex",
@@ -1688,12 +1623,11 @@ dependencies = [
16881623

16891624
[[package]]
16901625
name = "iana-time-zone-haiku"
1691-
version = "0.1.1"
1626+
version = "0.1.2"
16921627
source = "registry+https://github.com/rust-lang/crates.io-index"
1693-
checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
1628+
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
16941629
dependencies = [
1695-
"cxx",
1696-
"cxx-build",
1630+
"cc",
16971631
]
16981632

16991633
[[package]]
@@ -1780,11 +1714,10 @@ checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d"
17801714

17811715
[[package]]
17821716
name = "ignore"
1783-
version = "0.4.18"
1717+
version = "0.4.20"
17841718
source = "registry+https://github.com/rust-lang/crates.io-index"
1785-
checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
1719+
checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
17861720
dependencies = [
1787-
"crossbeam-utils",
17881721
"globset",
17891722
"lazy_static",
17901723
"log",
@@ -2035,15 +1968,6 @@ dependencies = [
20351968
"vcpkg",
20361969
]
20371970

2038-
[[package]]
2039-
name = "link-cplusplus"
2040-
version = "1.0.8"
2041-
source = "registry+https://github.com/rust-lang/crates.io-index"
2042-
checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
2043-
dependencies = [
2044-
"cc",
2045-
]
2046-
20471971
[[package]]
20481972
name = "linkchecker"
20491973
version = "0.1.0"
@@ -2224,24 +2148,6 @@ dependencies = [
22242148
"libc",
22252149
]
22262150

2227-
[[package]]
2228-
name = "memoffset"
2229-
version = "0.6.5"
2230-
source = "registry+https://github.com/rust-lang/crates.io-index"
2231-
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
2232-
dependencies = [
2233-
"autocfg",
2234-
]
2235-
2236-
[[package]]
2237-
name = "memoffset"
2238-
version = "0.7.1"
2239-
source = "registry+https://github.com/rust-lang/crates.io-index"
2240-
checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
2241-
dependencies = [
2242-
"autocfg",
2243-
]
2244-
22452151
[[package]]
22462152
name = "memoffset"
22472153
version = "0.8.0"
@@ -2439,11 +2345,11 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
24392345

24402346
[[package]]
24412347
name = "opener"
2442-
version = "0.5.0"
2348+
version = "0.5.2"
24432349
source = "registry+https://github.com/rust-lang/crates.io-index"
2444-
checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952"
2350+
checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005"
24452351
dependencies = [
2446-
"bstr 0.2.17",
2352+
"bstr",
24472353
"winapi",
24482354
]
24492355

@@ -4082,7 +3988,7 @@ version = "0.0.0"
40823988
dependencies = [
40833989
"field-offset",
40843990
"measureme",
4085-
"memoffset 0.6.5",
3991+
"memoffset",
40863992
"rustc-rayon-core",
40873993
"rustc_ast",
40883994
"rustc_data_structures",
@@ -4530,12 +4436,6 @@ version = "1.1.0"
45304436
source = "registry+https://github.com/rust-lang/crates.io-index"
45314437
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
45324438

4533-
[[package]]
4534-
name = "scratch"
4535-
version = "1.0.5"
4536-
source = "registry+https://github.com/rust-lang/crates.io-index"
4537-
checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
4538-
45394439
[[package]]
45404440
name = "self_cell"
45414441
version = "0.10.2"
@@ -5234,7 +5134,7 @@ version = "0.10.0"
52345134
source = "registry+https://github.com/rust-lang/crates.io-index"
52355135
checksum = "191a442639ea102fa62671026047e51d574bfda44b7fdf32151d7314624c1cd2"
52365136
dependencies = [
5237-
"bstr 1.3.0",
5137+
"bstr",
52385138
"cargo-platform",
52395139
"cargo_metadata 0.15.3",
52405140
"color-eyre",

‎compiler/rustc_query_impl/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77

88

99
[dependencies]
10-
memoffset = { version = "0.6.0", features = ["unstable_const"] }
10+
memoffset = { version = "0.8.0", features = ["unstable_const"] }
1111
field-offset = "0.3.5"
1212
measureme = "10.0.0"
1313
rustc_ast = { path = "../rustc_ast" }

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

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ const LICENSES: &[&str] = &[
3838
const EXCEPTIONS: &[(&str, &str)] = &[
3939
// tidy-alphabetical-start
4040
("ar_archive_writer", "Apache-2.0 WITH LLVM-exception"), // rustc
41-
("codespan-reporting", "Apache-2.0"), // cxx via iana-time-zone-haiku via time, only on haiku
4241
("colored", "MPL-2.0"), // rustfmt
4342
("dissimilar", "Apache-2.0"), // rustdoc, rustc_lexer (few tests) via expect-test, (dev deps)
4443
("fluent-langneg", "Apache-2.0"), // rustc (fluent translations)

0 commit comments

Comments
 (0)