Skip to content

Commit 2b8902c

Browse files
authored
Merge branch 'rust-lang:master' into master
2 parents 0d4cc0a + 3114eb1 commit 2b8902c

File tree

2,120 files changed

+30467
-23365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,120 files changed

+30467
-23365
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: mingw-check-tidy
5656
os: ubuntu-20.04-16core-64gb
5757
env: {}
58-
- name: x86_64-gnu-llvm-14
58+
- name: x86_64-gnu-llvm-15
5959
os: ubuntu-20.04-16core-64gb
6060
env: {}
6161
- name: x86_64-gnu-tools
@@ -293,10 +293,6 @@ jobs:
293293
env:
294294
RUST_BACKTRACE: 1
295295
os: ubuntu-20.04-8core-32gb
296-
- name: x86_64-gnu-llvm-14
297-
env:
298-
RUST_BACKTRACE: 1
299-
os: ubuntu-20.04-8core-32gb
300296
- name: x86_64-gnu-nopt
301297
os: ubuntu-20.04-4core-16gb
302298
env: {}

.reuse/dep5

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ Files: compiler/*
3838
Copyright: The Rust Project Developers (see https://thanks.rust-lang.org)
3939
License: MIT or Apache-2.0
4040

41-
Files: compiler/rustc_apfloat/*
42-
Copyright: LLVM APFloat authors
43-
The Rust Project Developers (see https://thanks.rust-lang.org)
44-
License: NCSA AND (MIT OR Apache-2.0)
45-
4641
Files: compiler/rustc_codegen_cranelift/src/cranelift_native.rs
4742
Copyright: The Cranelift Project Developers
4843
The Rust Project Developers (see https://thanks.rust-lang.org)

Cargo.lock

Lines changed: 67 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ dependencies = [
220220
"proc-macro2",
221221
"quote",
222222
"serde",
223-
"syn 2.0.8",
223+
"syn 2.0.27",
224224
]
225225

226226
[[package]]
@@ -502,7 +502,7 @@ dependencies = [
502502
"heck",
503503
"proc-macro2",
504504
"quote",
505-
"syn 2.0.8",
505+
"syn 2.0.27",
506506
]
507507

508508
[[package]]
@@ -513,16 +513,25 @@ checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
513513

514514
[[package]]
515515
name = "clippy"
516-
version = "0.1.72"
516+
version = "0.1.73"
517517
dependencies = [
518518
"clippy_lints",
519+
"clippy_utils",
520+
"derive-new",
519521
"filetime",
522+
"futures",
523+
"if_chain",
520524
"itertools",
525+
"parking_lot 0.12.1",
526+
"quote",
521527
"regex",
522528
"rustc_tools_util",
529+
"serde",
530+
"syn 2.0.27",
523531
"tempfile",
524532
"termize",
525533
"tester",
534+
"tokio",
526535
"toml 0.7.5",
527536
"ui_test",
528537
"walkdir",
@@ -543,7 +552,7 @@ dependencies = [
543552

544553
[[package]]
545554
name = "clippy_lints"
546-
version = "0.1.72"
555+
version = "0.1.73"
547556
dependencies = [
548557
"arrayvec",
549558
"cargo_metadata",
@@ -566,27 +575,9 @@ dependencies = [
566575
"url",
567576
]
568577

569-
[[package]]
570-
name = "clippy_test_deps"
571-
version = "0.1.0"
572-
dependencies = [
573-
"clippy_lints",
574-
"clippy_utils",
575-
"derive-new",
576-
"futures",
577-
"if_chain",
578-
"itertools",
579-
"parking_lot 0.12.1",
580-
"quote",
581-
"regex",
582-
"serde",
583-
"syn 2.0.8",
584-
"tokio",
585-
]
586-
587578
[[package]]
588579
name = "clippy_utils"
589-
version = "0.1.72"
580+
version = "0.1.73"
590581
dependencies = [
591582
"arrayvec",
592583
"if_chain",
@@ -650,9 +641,9 @@ dependencies = [
650641

651642
[[package]]
652643
name = "compiler_builtins"
653-
version = "0.1.95"
644+
version = "0.1.98"
654645
source = "registry+https://github.com/rust-lang/crates.io-index"
655-
checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
646+
checksum = "dfbefa16407456e5cad1ad066c84dfcb980afe4437103a0007d1c2f136130210"
656647
dependencies = [
657648
"cc",
658649
"rustc-std-workspace-core",
@@ -847,11 +838,11 @@ checksum = "a0afaad2b26fa326569eb264b1363e8ae3357618c43982b3f285f0774ce76b69"
847838

848839
[[package]]
849840
name = "declare_clippy_lint"
850-
version = "0.1.72"
841+
version = "0.1.73"
851842
dependencies = [
852843
"itertools",
853844
"quote",
854-
"syn 2.0.8",
845+
"syn 2.0.27",
855846
]
856847

857848
[[package]]
@@ -952,7 +943,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
952943
dependencies = [
953944
"proc-macro2",
954945
"quote",
955-
"syn 2.0.8",
946+
"syn 2.0.27",
956947
]
957948

958949
[[package]]
@@ -1318,7 +1309,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
13181309
dependencies = [
13191310
"proc-macro2",
13201311
"quote",
1321-
"syn 2.0.8",
1312+
"syn 2.0.27",
13221313
]
13231314

13241315
[[package]]
@@ -2465,7 +2456,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
24652456
dependencies = [
24662457
"proc-macro2",
24672458
"quote",
2468-
"syn 2.0.8",
2459+
"syn 2.0.27",
24692460
]
24702461

24712462
[[package]]
@@ -2504,6 +2495,7 @@ dependencies = [
25042495
"serde_json",
25052496
"sysinfo",
25062497
"tar",
2498+
"tempfile",
25072499
"xz",
25082500
"zip",
25092501
]
@@ -2652,7 +2644,7 @@ dependencies = [
26522644
"pest_meta",
26532645
"proc-macro2",
26542646
"quote",
2655-
"syn 2.0.8",
2647+
"syn 2.0.27",
26562648
]
26572649

26582650
[[package]]
@@ -3144,7 +3136,9 @@ dependencies = [
31443136

31453137
[[package]]
31463138
name = "rustc_apfloat"
3147-
version = "0.0.0"
3139+
version = "0.2.0+llvm-462a31f5a5ab"
3140+
source = "registry+https://github.com/rust-lang/crates.io-index"
3141+
checksum = "465187772033a5ee566f69fe008df03628fce549a0899aae76f0a0c2e34696be"
31483142
dependencies = [
31493143
"bitflags 1.3.2",
31503144
"smallvec",
@@ -3376,7 +3370,6 @@ dependencies = [
33763370
"rustc_type_ir",
33773371
"serde_json",
33783372
"smallvec",
3379-
"snap",
33803373
"tempfile",
33813374
"thorin-dwp",
33823375
"tracing",
@@ -3497,6 +3490,7 @@ dependencies = [
34973490
"rustc_trait_selection",
34983491
"rustc_ty_utils",
34993492
"serde_json",
3493+
"time",
35003494
"tracing",
35013495
"windows",
35023496
]
@@ -3593,7 +3587,7 @@ dependencies = [
35933587
"fluent-syntax",
35943588
"proc-macro2",
35953589
"quote",
3596-
"syn 2.0.8",
3590+
"syn 2.0.27",
35973591
"unic-langid",
35983592
]
35993593

@@ -3741,7 +3735,6 @@ dependencies = [
37413735
name = "rustc_interface"
37423736
version = "0.0.0"
37433737
dependencies = [
3744-
"atty",
37453738
"libloading",
37463739
"rustc-rayon",
37473740
"rustc-rayon-core",
@@ -3863,7 +3856,7 @@ version = "0.1.0"
38633856
dependencies = [
38643857
"proc-macro2",
38653858
"quote",
3866-
"syn 2.0.8",
3859+
"syn 2.0.27",
38673860
"synstructure 0.13.0",
38683861
]
38693862

@@ -4205,7 +4198,6 @@ dependencies = [
42054198
name = "rustc_session"
42064199
version = "0.0.0"
42074200
dependencies = [
4208-
"atty",
42094201
"bitflags 1.3.2",
42104202
"getopts",
42114203
"libc",
@@ -4471,7 +4463,7 @@ dependencies = [
44714463
"proc-macro2",
44724464
"quote",
44734465
"serde",
4474-
"syn 2.0.8",
4466+
"syn 2.0.27",
44754467
]
44764468

44774469
[[package]]
@@ -4638,7 +4630,7 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
46384630
dependencies = [
46394631
"proc-macro2",
46404632
"quote",
4641-
"syn 2.0.8",
4633+
"syn 2.0.27",
46424634
]
46434635

46444636
[[package]]
@@ -4734,9 +4726,9 @@ dependencies = [
47344726

47354727
[[package]]
47364728
name = "smallvec"
4737-
version = "1.10.0"
4729+
version = "1.11.0"
47384730
source = "registry+https://github.com/rust-lang/crates.io-index"
4739-
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
4731+
checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
47404732

47414733
[[package]]
47424734
name = "snap"
@@ -4919,9 +4911,9 @@ dependencies = [
49194911

49204912
[[package]]
49214913
name = "syn"
4922-
version = "2.0.8"
4914+
version = "2.0.27"
49234915
source = "registry+https://github.com/rust-lang/crates.io-index"
4924-
checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
4916+
checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
49254917
dependencies = [
49264918
"proc-macro2",
49274919
"quote",
@@ -4948,7 +4940,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06"
49484940
dependencies = [
49494941
"proc-macro2",
49504942
"quote",
4951-
"syn 2.0.8",
4943+
"syn 2.0.27",
49524944
"unicode-xid",
49534945
]
49544946

@@ -5098,7 +5090,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
50985090
dependencies = [
50995091
"proc-macro2",
51005092
"quote",
5101-
"syn 2.0.8",
5093+
"syn 2.0.27",
51025094
]
51035095

51045096
[[package]]
@@ -5151,6 +5143,33 @@ dependencies = [
51515143
name = "tier-check"
51525144
version = "0.1.0"
51535145

5146+
[[package]]
5147+
name = "time"
5148+
version = "0.3.22"
5149+
source = "registry+https://github.com/rust-lang/crates.io-index"
5150+
checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
5151+
dependencies = [
5152+
"itoa",
5153+
"serde",
5154+
"time-core",
5155+
"time-macros",
5156+
]
5157+
5158+
[[package]]
5159+
name = "time-core"
5160+
version = "0.1.1"
5161+
source = "registry+https://github.com/rust-lang/crates.io-index"
5162+
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
5163+
5164+
[[package]]
5165+
name = "time-macros"
5166+
version = "0.2.9"
5167+
source = "registry+https://github.com/rust-lang/crates.io-index"
5168+
checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
5169+
dependencies = [
5170+
"time-core",
5171+
]
5172+
51545173
[[package]]
51555174
name = "tinystr"
51565175
version = "0.7.1"
@@ -5292,7 +5311,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
52925311
dependencies = [
52935312
"proc-macro2",
52945313
"quote",
5295-
"syn 2.0.8",
5314+
"syn 2.0.27",
52965315
]
52975316

52985317
[[package]]
@@ -5722,7 +5741,7 @@ dependencies = [
57225741
"once_cell",
57235742
"proc-macro2",
57245743
"quote",
5725-
"syn 2.0.8",
5744+
"syn 2.0.27",
57265745
"wasm-bindgen-shared",
57275746
]
57285747

@@ -5756,7 +5775,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
57565775
dependencies = [
57575776
"proc-macro2",
57585777
"quote",
5759-
"syn 2.0.8",
5778+
"syn 2.0.27",
57605779
"wasm-bindgen-backend",
57615780
"wasm-bindgen-shared",
57625781
]

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ members = [
99
"src/tools/cargotest",
1010
"src/tools/clippy",
1111
"src/tools/clippy/clippy_dev",
12-
"src/tools/clippy/clippy_test_deps",
1312
"src/tools/compiletest",
1413
"src/tools/error_index_generator",
1514
"src/tools/linkchecker",

LICENSES/NCSA.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

RELEASES.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ Cargo
9292
-----
9393
- [Allow named debuginfo options in `Cargo.toml`.](https://github.com/rust-lang/cargo/pull/11958/)
9494
- [Add `workspace_default_members` to the output of `cargo metadata`.](https://github.com/rust-lang/cargo/pull/11978/)
95-
- [`cargo add` now considers `rust-version` when selecting packages.](https://github.com/rust-lang/cargo/pull/12078/)
9695
- [Automatically inherit workspace fields when running `cargo new`/`cargo init`.](https://github.com/rust-lang/cargo/pull/12069/)
9796

9897
<a id="1.71.0-Rustdoc"></a>

0 commit comments

Comments
 (0)