Skip to content

Commit 1024689

Browse files
committed
rebase
2 parents 04e1f91 + 88189a7 commit 1024689

File tree

2,714 files changed

+44093
-23282
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,714 files changed

+44093
-23282
lines changed

.github/ISSUE_TEMPLATE/diagnostics.yaml

+16-3
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,23 @@ body:
5252
render: Rust
5353
validations:
5454
required: false
55-
- type: markdown
55+
- type: textarea
56+
id: version
5657
attributes:
57-
value: |
58-
If you're using the stable version of the compiler, you should also check if the bug also exists in the beta or nightly versions. The output might also be different depending on the Edition.
58+
label: Rust Version
59+
description: Please provide the `rustc` version, `rustc --version --verbose`. Make sure that you're using the latest version of the compiler, and not an outdated stable or nightly release!
60+
placeholder: |
61+
$ rustc --version --verbose
62+
rustc 1.XX.Y (SHORTHASH DATE)
63+
binary: rustc
64+
commit-hash: LONGHASHVALUE
65+
commit-date: DATE
66+
host: PLATFORMTRIPLE
67+
release: 1.XX.Y
68+
LLVM version: XX.YY.ZZ
69+
render: Shell
70+
validations:
71+
required: true
5972
- type: textarea
6073
id: extra
6174
attributes:

.github/ISSUE_TEMPLATE/ice.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ body:
4040
id: version
4141
attributes:
4242
label: Rust Version
43-
description: Please provide the `rustc` version, `rustc --version --verbose`
43+
description: Please provide the `rustc` version, `rustc --version --verbose`. Make sure that you're using the latest version of the compiler, and not an outdated stable or nightly release!
4444
placeholder: |
4545
$ rustc --version --verbose
4646
rustc 1.XX.Y (SHORTHASH DATE)

.reuse/dep5

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Files: compiler/*
1818
configure
1919
CONTRIBUTING.md
2020
COPYRIGHT
21+
INSTALL.md
2122
LICENSE-APACHE
2223
LICENSE-MIT
2324
README.md
@@ -51,7 +52,7 @@ Copyright: 2019 The Crossbeam Project Developers
5152
The Rust Project Developers (see https://thanks.rust-lang.org)
5253
License: MIT OR Apache-2.0
5354

54-
Files: library/std/src/sys/unix/locks/fuchsia_mutex.rs
55+
Files: library/std/src/sys/pal/unix/locks/fuchsia_mutex.rs
5556
Copyright: 2016 The Fuchsia Authors
5657
The Rust Project Developers (see https://thanks.rust-lang.org)
5758
License: BSD-2-Clause AND (MIT OR Apache-2.0)

Cargo.lock

+31-21
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,16 @@ dependencies = [
119119
"yansi-term",
120120
]
121121

122+
[[package]]
123+
name = "annotate-snippets"
124+
version = "0.10.1"
125+
source = "registry+https://github.com/rust-lang/crates.io-index"
126+
checksum = "0a433302f833baa830c0092100c481c7ea768c5981a3c36f549517a502f246dd"
127+
dependencies = [
128+
"anstyle",
129+
"unicode-width",
130+
]
131+
122132
[[package]]
123133
name = "ansi_term"
124134
version = "0.12.1"
@@ -704,9 +714,9 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
704714

705715
[[package]]
706716
name = "compiler_builtins"
707-
version = "0.1.103"
717+
version = "0.1.105"
708718
source = "registry+https://github.com/rust-lang/crates.io-index"
709-
checksum = "a3b73c3443a5fd2438d7ba4853c64e4c8efc2404a9e28a9234cc2d5eebc6c242"
719+
checksum = "3686cc48897ce1950aa70fd595bd2dc9f767a3c4cca4cd17b2cb52a2d37e6eb4"
710720
dependencies = [
711721
"cc",
712722
"rustc-std-workspace-core",
@@ -2356,9 +2366,9 @@ dependencies = [
23562366

23572367
[[package]]
23582368
name = "measureme"
2359-
version = "10.1.2"
2369+
version = "11.0.1"
23602370
source = "registry+https://github.com/rust-lang/crates.io-index"
2361-
checksum = "45e381dcdad44c3c435f8052b08c5c4a1449c48ab56f312345eae12d7a693dbe"
2371+
checksum = "dfa4a40f09af7aa6faef38285402a78847d0d72bf8827006cd2a332e1e6e4a8d"
23622372
dependencies = [
23632373
"log",
23642374
"memmap2",
@@ -2465,6 +2475,7 @@ dependencies = [
24652475
"ctrlc",
24662476
"env_logger",
24672477
"getrandom",
2478+
"jemalloc-sys",
24682479
"lazy_static",
24692480
"libc",
24702481
"libffi",
@@ -2474,7 +2485,6 @@ dependencies = [
24742485
"rand",
24752486
"regex",
24762487
"rustc_version",
2477-
"serde",
24782488
"smallvec",
24792489
"ui_test",
24802490
]
@@ -3280,9 +3290,9 @@ dependencies = [
32803290

32813291
[[package]]
32823292
name = "rustc-build-sysroot"
3283-
version = "0.4.2"
3293+
version = "0.4.4"
32843294
source = "registry+https://github.com/rust-lang/crates.io-index"
3285-
checksum = "8ed2a90dfa5232ed5ff21d53d4df655f315ab316ea06fc508f1c74bcedb1ce6c"
3295+
checksum = "39dcf8d82b1f79a179bdb284dc44db440a9666eefa5a6df5ef282d6db930d544"
32863296
dependencies = [
32873297
"anyhow",
32883298
"rustc_version",
@@ -3738,6 +3748,7 @@ dependencies = [
37383748
"rustc_trait_selection",
37393749
"rustc_ty_utils",
37403750
"serde_json",
3751+
"shlex",
37413752
"time",
37423753
"tracing",
37433754
"windows",
@@ -3770,7 +3781,7 @@ dependencies = [
37703781
name = "rustc_errors"
37713782
version = "0.0.0"
37723783
dependencies = [
3773-
"annotate-snippets",
3784+
"annotate-snippets 0.10.1",
37743785
"derive_setters",
37753786
"rustc_ast",
37763787
"rustc_ast_pretty",
@@ -3797,7 +3808,6 @@ dependencies = [
37973808
name = "rustc_expand"
37983809
version = "0.0.0"
37993810
dependencies = [
3800-
"crossbeam-channel",
38013811
"rustc_ast",
38023812
"rustc_ast_passes",
38033813
"rustc_ast_pretty",
@@ -3831,7 +3841,7 @@ dependencies = [
38313841
name = "rustc_fluent_macro"
38323842
version = "0.0.0"
38333843
dependencies = [
3834-
"annotate-snippets",
3844+
"annotate-snippets 0.10.1",
38353845
"fluent-bundle",
38363846
"fluent-syntax",
38373847
"proc-macro2",
@@ -3869,6 +3879,7 @@ dependencies = [
38693879
name = "rustc_hir_analysis"
38703880
version = "0.0.0"
38713881
dependencies = [
3882+
"itertools",
38723883
"rustc_arena",
38733884
"rustc_ast",
38743885
"rustc_attr",
@@ -3877,6 +3888,7 @@ dependencies = [
38773888
"rustc_feature",
38783889
"rustc_fluent_macro",
38793890
"rustc_hir",
3891+
"rustc_hir_pretty",
38803892
"rustc_index",
38813893
"rustc_infer",
38823894
"rustc_lint_defs",
@@ -3906,6 +3918,7 @@ dependencies = [
39063918
name = "rustc_hir_typeck"
39073919
version = "0.0.0"
39083920
dependencies = [
3921+
"itertools",
39093922
"rustc_ast",
39103923
"rustc_attr",
39113924
"rustc_data_structures",
@@ -4189,6 +4202,7 @@ name = "rustc_mir_build"
41894202
version = "0.0.0"
41904203
dependencies = [
41914204
"either",
4205+
"itertools",
41924206
"rustc_apfloat",
41934207
"rustc_arena",
41944208
"rustc_ast",
@@ -4342,6 +4356,7 @@ name = "rustc_pattern_analysis"
43424356
version = "0.0.0"
43434357
dependencies = [
43444358
"derivative",
4359+
"rustc-hash",
43454360
"rustc_apfloat",
43464361
"rustc_arena",
43474362
"rustc_data_structures",
@@ -4356,7 +4371,6 @@ dependencies = [
43564371
"rustc_target",
43574372
"smallvec",
43584373
"tracing",
4359-
"typed-arena",
43604374
]
43614375

43624376
[[package]]
@@ -4564,6 +4578,7 @@ checksum = "8ba09476327c4b70ccefb6180f046ef588c26a24cf5d269a9feba316eb4f029f"
45644578
name = "rustc_trait_selection"
45654579
version = "0.0.0"
45664580
dependencies = [
4581+
"bitflags 2.4.1",
45674582
"itertools",
45684583
"rustc_ast",
45694584
"rustc_attr",
@@ -4645,6 +4660,7 @@ dependencies = [
46454660
"rustc_index",
46464661
"rustc_macros",
46474662
"rustc_serialize",
4663+
"rustc_span",
46484664
"smallvec",
46494665
]
46504666

@@ -4737,7 +4753,7 @@ dependencies = [
47374753
name = "rustfmt-nightly"
47384754
version = "1.7.0"
47394755
dependencies = [
4740-
"annotate-snippets",
4756+
"annotate-snippets 0.9.1",
47414757
"anyhow",
47424758
"bytecount",
47434759
"cargo_metadata 0.15.4",
@@ -5693,12 +5709,6 @@ dependencies = [
56935709
"rustc-hash",
56945710
]
56955711

5696-
[[package]]
5697-
name = "typed-arena"
5698-
version = "2.0.2"
5699-
source = "registry+https://github.com/rust-lang/crates.io-index"
5700-
checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
5701-
57025712
[[package]]
57035713
name = "typenum"
57045714
version = "1.16.0"
@@ -5727,7 +5737,7 @@ version = "0.21.2"
57275737
source = "registry+https://github.com/rust-lang/crates.io-index"
57285738
checksum = "aaf4bf7c184b8dfc7a4d3b90df789b1eb992ee42811cd115f32a7a1eb781058d"
57295739
dependencies = [
5730-
"annotate-snippets",
5740+
"annotate-snippets 0.9.1",
57315741
"anyhow",
57325742
"bstr",
57335743
"cargo-platform",
@@ -5858,9 +5868,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
58585868

58595869
[[package]]
58605870
name = "unicode-width"
5861-
version = "0.1.10"
5871+
version = "0.1.11"
58625872
source = "registry+https://github.com/rust-lang/crates.io-index"
5863-
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
5873+
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
58645874
dependencies = [
58655875
"compiler_builtins",
58665876
"rustc-std-workspace-core",

Cargo.toml

+9-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ exclude = [
6464
]
6565

6666
[profile.release.package.compiler_builtins]
67-
# The compiler-builtins crate cannot reference libcore, and it's own CI will
67+
# The compiler-builtins crate cannot reference libcore, and its own CI will
6868
# verify that this is the case. This requires, however, that the crate is built
6969
# without overflow checks and debug assertions. Forcefully disable debug
7070
# assertions and overflow checks here which should ensure that even if these
@@ -104,6 +104,14 @@ gimli.debug = 0
104104
miniz_oxide.debug = 0
105105
object.debug = 0
106106

107+
# These are very thin wrappers around executing lld with the right binary name.
108+
# Basically nothing within them can go wrong without having been explicitly logged anyway.
109+
# We ship these in every rustc tarball and even after compression they add up
110+
# to around 0.6MB of data every user needs to download (and 15MB on disk).
111+
[profile.release.package.lld-wrapper]
112+
debug = 0
113+
strip = true
114+
107115
[patch.crates-io]
108116
# See comments in `library/rustc-std-workspace-core/README.md` for what's going on
109117
# here

0 commit comments

Comments
 (0)