Skip to content

Commit f8fbc6d

Browse files
borsbors
committed
Auto merge of rust-lang#2702 - RalfJung:rustup, r=RalfJung
Rustup No changes happened on the rustc side, but I want to do a push next and would rather make josh's life easier by integrating some recent history first.
2 parents 66354f0 + 598c3da commit f8fbc6d

File tree

1,924 files changed

+27668
-31618
lines changed

Some content is hidden

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

1,924 files changed

+27668
-31618
lines changed

‎.github/workflows/ci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ jobs:
9696
- name: install sccache
9797
run: src/ci/scripts/install-sccache.sh
9898
if: success() && !env.SKIP_JOB
99+
- name: select Xcode
100+
run: src/ci/scripts/select-xcode.sh
101+
if: success() && !env.SKIP_JOB
99102
- name: install clang
100103
run: src/ci/scripts/install-clang.sh
101104
if: success() && !env.SKIP_JOB
@@ -301,6 +304,7 @@ jobs:
301304
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
302305
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
303306
MACOSX_DEPLOYMENT_TARGET: 10.7
307+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
304308
NO_LLVM_ASSERTIONS: 1
305309
NO_DEBUG_ASSERTIONS: 1
306310
NO_OVERFLOW_CHECKS: 1
@@ -312,6 +316,7 @@ jobs:
312316
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
313317
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
314318
MACOSX_DEPLOYMENT_TARGET: 10.7
319+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
315320
NO_LLVM_ASSERTIONS: 1
316321
NO_DEBUG_ASSERTIONS: 1
317322
NO_OVERFLOW_CHECKS: 1
@@ -322,6 +327,7 @@ jobs:
322327
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
323328
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
324329
MACOSX_DEPLOYMENT_TARGET: 10.7
330+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
325331
NO_LLVM_ASSERTIONS: 1
326332
NO_DEBUG_ASSERTIONS: 1
327333
NO_OVERFLOW_CHECKS: 1
@@ -353,6 +359,7 @@ jobs:
353359
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
354360
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --disable-docs --set rust.jemalloc --set llvm.ninja=false"
355361
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
362+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
356363
USE_XCODE_CLANG: 1
357364
MACOSX_DEPLOYMENT_TARGET: 11.0
358365
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
@@ -503,6 +510,9 @@ jobs:
503510
- name: install sccache
504511
run: src/ci/scripts/install-sccache.sh
505512
if: success() && !env.SKIP_JOB
513+
- name: select Xcode
514+
run: src/ci/scripts/select-xcode.sh
515+
if: success() && !env.SKIP_JOB
506516
- name: install clang
507517
run: src/ci/scripts/install-clang.sh
508518
if: success() && !env.SKIP_JOB
@@ -615,6 +625,9 @@ jobs:
615625
- name: install sccache
616626
run: src/ci/scripts/install-sccache.sh
617627
if: success() && !env.SKIP_JOB
628+
- name: select Xcode
629+
run: src/ci/scripts/select-xcode.sh
630+
if: success() && !env.SKIP_JOB
618631
- name: install clang
619632
run: src/ci/scripts/install-clang.sh
620633
if: success() && !env.SKIP_JOB

‎Cargo.lock

Lines changed: 47 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ dependencies = [
446446
"jobserver",
447447
"libc",
448448
"log",
449-
"miow 0.4.0",
449+
"miow 0.5.0",
450450
"same-file",
451451
"shell-escape",
452452
"tempfile",
@@ -498,10 +498,6 @@ name = "cfg-if"
498498
version = "0.1.10"
499499
source = "registry+https://github.com/rust-lang/crates.io-index"
500500
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
501-
dependencies = [
502-
"compiler_builtins",
503-
"rustc-std-workspace-core",
504-
]
505501

506502
[[package]]
507503
name = "cfg-if"
@@ -652,7 +648,7 @@ dependencies = [
652648

653649
[[package]]
654650
name = "clippy"
655-
version = "0.1.66"
651+
version = "0.1.67"
656652
dependencies = [
657653
"clippy_lints",
658654
"clippy_utils",
@@ -689,16 +685,16 @@ dependencies = [
689685
"itertools",
690686
"opener",
691687
"shell-escape",
692-
"tempfile",
693688
"walkdir",
694689
]
695690

696691
[[package]]
697692
name = "clippy_lints"
698-
version = "0.1.66"
693+
version = "0.1.67"
699694
dependencies = [
700695
"cargo_metadata 0.14.0",
701696
"clippy_utils",
697+
"declare_clippy_lint",
702698
"if_chain",
703699
"itertools",
704700
"pulldown-cmark",
@@ -717,7 +713,7 @@ dependencies = [
717713

718714
[[package]]
719715
name = "clippy_utils"
720-
version = "0.1.66"
716+
version = "0.1.67"
721717
dependencies = [
722718
"arrayvec",
723719
"if_chain",
@@ -793,9 +789,9 @@ dependencies = [
793789

794790
[[package]]
795791
name = "compiler_builtins"
796-
version = "0.1.82"
792+
version = "0.1.84"
797793
source = "registry+https://github.com/rust-lang/crates.io-index"
798-
checksum = "18cd7635fea7bb481ea543b392789844c1ad581299da70184c7175ce3af76603"
794+
checksum = "989b2c1ca6e90ad06fdc69d1d1862fa28d27a977be6d92ae2fa762cf61fe0b10"
799795
dependencies = [
800796
"cc",
801797
"rustc-std-workspace-core",
@@ -1044,6 +1040,15 @@ version = "2.0.1"
10441040
source = "registry+https://github.com/rust-lang/crates.io-index"
10451041
checksum = "a0afaad2b26fa326569eb264b1363e8ae3357618c43982b3f285f0774ce76b69"
10461042

1043+
[[package]]
1044+
name = "declare_clippy_lint"
1045+
version = "0.1.67"
1046+
dependencies = [
1047+
"itertools",
1048+
"quote",
1049+
"syn",
1050+
]
1051+
10471052
[[package]]
10481053
name = "derive-new"
10491054
version = "0.5.8"
@@ -2306,11 +2311,11 @@ dependencies = [
23062311

23072312
[[package]]
23082313
name = "miow"
2309-
version = "0.4.0"
2314+
version = "0.5.0"
23102315
source = "registry+https://github.com/rust-lang/crates.io-index"
2311-
checksum = "a7377f7792b3afb6a3cba68daa54ca23c032137010460d667fda53a8d66be00e"
2316+
checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123"
23122317
dependencies = [
2313-
"windows-sys 0.28.0",
2318+
"windows-sys",
23142319
]
23152320

23162321
[[package]]
@@ -2587,7 +2592,7 @@ dependencies = [
25872592
"libc",
25882593
"redox_syscall",
25892594
"smallvec",
2590-
"windows-sys 0.42.0",
2595+
"windows-sys",
25912596
]
25922597

25932598
[[package]]
@@ -2850,9 +2855,9 @@ checksum = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
28502855

28512856
[[package]]
28522857
name = "quote"
2853-
version = "1.0.18"
2858+
version = "1.0.21"
28542859
source = "registry+https://github.com/rust-lang/crates.io-index"
2855-
checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
2860+
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
28562861
dependencies = [
28572862
"proc-macro2",
28582863
]
@@ -3197,6 +3202,20 @@ dependencies = [
31973202
"winapi",
31983203
]
31993204

3205+
[[package]]
3206+
name = "rustc_abi"
3207+
version = "0.0.0"
3208+
dependencies = [
3209+
"bitflags",
3210+
"rand 0.8.5",
3211+
"rand_xoshiro",
3212+
"rustc_data_structures",
3213+
"rustc_index",
3214+
"rustc_macros",
3215+
"rustc_serialize",
3216+
"tracing",
3217+
]
3218+
32003219
[[package]]
32013220
name = "rustc_apfloat"
32023221
version = "0.0.0"
@@ -3433,6 +3452,7 @@ dependencies = [
34333452
name = "rustc_const_eval"
34343453
version = "0.0.0"
34353454
dependencies = [
3455+
"either",
34363456
"rustc_apfloat",
34373457
"rustc_ast",
34383458
"rustc_attr",
@@ -3927,6 +3947,7 @@ dependencies = [
39273947
name = "rustc_mir_build"
39283948
version = "0.0.0"
39293949
dependencies = [
3950+
"either",
39303951
"rustc_apfloat",
39313952
"rustc_arena",
39323953
"rustc_ast",
@@ -3973,6 +3994,7 @@ name = "rustc_mir_transform"
39733994
version = "0.0.0"
39743995
dependencies = [
39753996
"coverage_test_macros",
3997+
"either",
39763998
"itertools",
39773999
"rustc_ast",
39784000
"rustc_attr",
@@ -4273,6 +4295,7 @@ name = "rustc_target"
42734295
version = "0.0.0"
42744296
dependencies = [
42754297
"bitflags",
4298+
"rustc_abi",
42764299
"rustc_data_structures",
42774300
"rustc_feature",
42784301
"rustc_index",
@@ -4328,6 +4351,7 @@ dependencies = [
43284351
"rustc_infer",
43294352
"rustc_middle",
43304353
"rustc_span",
4354+
"rustc_target",
43314355
"rustc_trait_selection",
43324356
"smallvec",
43334357
"tracing",
@@ -4352,8 +4376,6 @@ dependencies = [
43524376
name = "rustc_ty_utils"
43534377
version = "0.0.0"
43544378
dependencies = [
4355-
"rand 0.8.5",
4356-
"rand_xoshiro",
43574379
"rustc_data_structures",
43584380
"rustc_errors",
43594381
"rustc_hir",
@@ -4931,7 +4953,7 @@ dependencies = [
49314953
name = "test"
49324954
version = "0.0.0"
49334955
dependencies = [
4934-
"cfg-if 0.1.10",
4956+
"cfg-if 1.0.0",
49354957
"core",
49364958
"getopts",
49374959
"libc",
@@ -5553,32 +5575,19 @@ version = "0.4.0"
55535575
source = "registry+https://github.com/rust-lang/crates.io-index"
55545576
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
55555577

5556-
[[package]]
5557-
name = "windows-sys"
5558-
version = "0.28.0"
5559-
source = "registry+https://github.com/rust-lang/crates.io-index"
5560-
checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6"
5561-
dependencies = [
5562-
"windows_aarch64_msvc 0.28.0",
5563-
"windows_i686_gnu 0.28.0",
5564-
"windows_i686_msvc 0.28.0",
5565-
"windows_x86_64_gnu 0.28.0",
5566-
"windows_x86_64_msvc 0.28.0",
5567-
]
5568-
55695578
[[package]]
55705579
name = "windows-sys"
55715580
version = "0.42.0"
55725581
source = "registry+https://github.com/rust-lang/crates.io-index"
55735582
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
55745583
dependencies = [
55755584
"windows_aarch64_gnullvm",
5576-
"windows_aarch64_msvc 0.42.0",
5577-
"windows_i686_gnu 0.42.0",
5578-
"windows_i686_msvc 0.42.0",
5579-
"windows_x86_64_gnu 0.42.0",
5585+
"windows_aarch64_msvc",
5586+
"windows_i686_gnu",
5587+
"windows_i686_msvc",
5588+
"windows_x86_64_gnu",
55805589
"windows_x86_64_gnullvm",
5581-
"windows_x86_64_msvc 0.42.0",
5590+
"windows_x86_64_msvc",
55825591
]
55835592

55845593
[[package]]
@@ -5587,48 +5596,24 @@ version = "0.42.0"
55875596
source = "registry+https://github.com/rust-lang/crates.io-index"
55885597
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
55895598

5590-
[[package]]
5591-
name = "windows_aarch64_msvc"
5592-
version = "0.28.0"
5593-
source = "registry+https://github.com/rust-lang/crates.io-index"
5594-
checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2"
5595-
55965599
[[package]]
55975600
name = "windows_aarch64_msvc"
55985601
version = "0.42.0"
55995602
source = "registry+https://github.com/rust-lang/crates.io-index"
56005603
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
56015604

5602-
[[package]]
5603-
name = "windows_i686_gnu"
5604-
version = "0.28.0"
5605-
source = "registry+https://github.com/rust-lang/crates.io-index"
5606-
checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a"
5607-
56085605
[[package]]
56095606
name = "windows_i686_gnu"
56105607
version = "0.42.0"
56115608
source = "registry+https://github.com/rust-lang/crates.io-index"
56125609
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
56135610

5614-
[[package]]
5615-
name = "windows_i686_msvc"
5616-
version = "0.28.0"
5617-
source = "registry+https://github.com/rust-lang/crates.io-index"
5618-
checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64"
5619-
56205611
[[package]]
56215612
name = "windows_i686_msvc"
56225613
version = "0.42.0"
56235614
source = "registry+https://github.com/rust-lang/crates.io-index"
56245615
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
56255616

5626-
[[package]]
5627-
name = "windows_x86_64_gnu"
5628-
version = "0.28.0"
5629-
source = "registry+https://github.com/rust-lang/crates.io-index"
5630-
checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954"
5631-
56325617
[[package]]
56335618
name = "windows_x86_64_gnu"
56345619
version = "0.42.0"
@@ -5641,12 +5626,6 @@ version = "0.42.0"
56415626
source = "registry+https://github.com/rust-lang/crates.io-index"
56425627
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
56435628

5644-
[[package]]
5645-
name = "windows_x86_64_msvc"
5646-
version = "0.28.0"
5647-
source = "registry+https://github.com/rust-lang/crates.io-index"
5648-
checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f"
5649-
56505629
[[package]]
56515630
name = "windows_x86_64_msvc"
56525631
version = "0.42.0"

‎compiler/rustc_abi/Cargo.toml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[package]
2+
name = "rustc_abi"
3+
version = "0.0.0"
4+
edition = "2021"
5+
6+
[dependencies]
7+
bitflags = "1.2.1"
8+
tracing = "0.1"
9+
rand = { version = "0.8.4", default-features = false, optional = true }
10+
rand_xoshiro = { version = "0.6.0", optional = true }
11+
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
12+
rustc_index = { path = "../rustc_index", default-features = false }
13+
rustc_macros = { path = "../rustc_macros", optional = true }
14+
rustc_serialize = { path = "../rustc_serialize", optional = true }
15+
16+
[features]
17+
default = ["nightly", "randomize"]
18+
randomize = ["rand", "rand_xoshiro"]
19+
nightly = [
20+
"rustc_data_structures",
21+
"rustc_index/nightly",
22+
"rustc_macros",
23+
"rustc_serialize",
24+
]

0 commit comments

Comments
 (0)