Skip to content

Commit 0aeb8b3

Browse files
Merge branch 'master' into rename-nestedmetaitem-to-metaitemlnner
2 parents dcca262 + 3002af6 commit 0aeb8b3

File tree

510 files changed

+9643
-3961
lines changed

Some content is hidden

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

510 files changed

+9643
-3961
lines changed

.github/ISSUE_TEMPLATE/blank_issue.md

-4
This file was deleted.

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ tracking issue or there are none, feel free to ignore this.
77
This PR will get automatically assigned to a reviewer. In case you would like
88
a specific user to review your work, you can assign it to them by using
99
10-
r? <reviewer name>
10+
r\? <reviewer name> (with the `\` removed)
1111
-->
1212
<!-- homu-ignore:end -->

.github/workflows/ci.yml

+10
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,16 @@ jobs:
212212
# erroring about invalid credentials instead.
213213
if: github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1'
214214

215+
- name: upload job metrics to DataDog
216+
if: needs.calculate_matrix.outputs.run_type != 'pr'
217+
env:
218+
DATADOG_SITE: datadoghq.com
219+
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
220+
DD_GITHUB_JOB_NAME: ${{ matrix.name }}
221+
run: |
222+
npm install -g @datadog/datadog-ci@^2.x.x
223+
python3 src/ci/scripts/upload-build-metrics.py build/cpu-usage.csv
224+
215225
# This job isused to tell bors the final status of the build, as there is no practical way to detect
216226
# when a workflow is successful listening to webhooks only in our current bors implementation (homu).
217227
outcome:

.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,13 @@ package.json
8686
## Rustdoc GUI tests
8787
tests/rustdoc-gui/src/**.lock
8888

89+
## direnv
90+
.envrc
91+
.direnv/
92+
93+
## nix
94+
flake.nix
95+
flake.lock
96+
default.nix
97+
8998
# Before adding new lines, see the comment at the top.

Cargo.lock

+56-26
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,12 @@ dependencies = [
199199
"object 0.36.4",
200200
]
201201

202+
[[package]]
203+
name = "arrayref"
204+
version = "0.3.7"
205+
source = "registry+https://github.com/rust-lang/crates.io-index"
206+
checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
207+
202208
[[package]]
203209
name = "arrayvec"
204210
version = "0.7.6"
@@ -262,6 +268,19 @@ version = "2.6.0"
262268
source = "registry+https://github.com/rust-lang/crates.io-index"
263269
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
264270

271+
[[package]]
272+
name = "blake3"
273+
version = "1.5.2"
274+
source = "registry+https://github.com/rust-lang/crates.io-index"
275+
checksum = "3d08263faac5cde2a4d52b513dadb80846023aade56fcd8fc99ba73ba8050e92"
276+
dependencies = [
277+
"arrayref",
278+
"arrayvec",
279+
"cc",
280+
"cfg-if",
281+
"constant_time_eq",
282+
]
283+
265284
[[package]]
266285
name = "block-buffer"
267286
version = "0.10.4"
@@ -393,9 +412,12 @@ version = "0.1.0"
393412

394413
[[package]]
395414
name = "cc"
396-
version = "1.0.105"
415+
version = "1.1.23"
397416
source = "registry+https://github.com/rust-lang/crates.io-index"
398-
checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437"
417+
checksum = "3bbb537bb4a30b90362caddba8f360c0a56bc13d3a5570028e7197204cb54a17"
418+
dependencies = [
419+
"shlex",
420+
]
399421

400422
[[package]]
401423
name = "cfg-if"
@@ -719,6 +741,12 @@ dependencies = [
719741
"windows-sys 0.52.0",
720742
]
721743

744+
[[package]]
745+
name = "constant_time_eq"
746+
version = "0.3.0"
747+
source = "registry+https://github.com/rust-lang/crates.io-index"
748+
checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
749+
722750
[[package]]
723751
name = "core-foundation-sys"
724752
version = "0.8.7"
@@ -3448,6 +3476,7 @@ dependencies = [
34483476
"rustc_span",
34493477
"rustc_symbol_mangling",
34503478
"rustc_target",
3479+
"rustc_trait_selection",
34513480
"rustc_type_ir",
34523481
"serde_json",
34533482
"smallvec",
@@ -4374,6 +4403,7 @@ dependencies = [
43744403
name = "rustc_span"
43754404
version = "0.0.0"
43764405
dependencies = [
4406+
"blake3",
43774407
"derive-where",
43784408
"indexmap",
43794409
"itoa",
@@ -5768,16 +5798,16 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
57685798

57695799
[[package]]
57705800
name = "wasm-component-ld"
5771-
version = "0.5.8"
5801+
version = "0.5.9"
57725802
source = "registry+https://github.com/rust-lang/crates.io-index"
5773-
checksum = "cb17cdbc91766d4ea0bcd6026c36ba77a21b5c8199aeb1f0993461fe6a6bec2b"
5803+
checksum = "fde17bc96539700198e12516230c76095cc215c84ef39ad206e1af3f84243e0f"
57745804
dependencies = [
57755805
"anyhow",
57765806
"clap",
57775807
"lexopt",
57785808
"tempfile",
57795809
"wasi-preview1-component-adapter-provider",
5780-
"wasmparser 0.217.0",
5810+
"wasmparser 0.218.0",
57815811
"wat",
57825812
"wit-component",
57835813
"wit-parser",
@@ -5801,28 +5831,28 @@ dependencies = [
58015831

58025832
[[package]]
58035833
name = "wasm-encoder"
5804-
version = "0.217.0"
5834+
version = "0.218.0"
58055835
source = "registry+https://github.com/rust-lang/crates.io-index"
5806-
checksum = "7b88b0814c9a2b323a9b46c687e726996c255ac8b64aa237dd11c81ed4854760"
5836+
checksum = "22b896fa8ceb71091ace9bcb81e853f54043183a1c9667cf93422c40252ffa0a"
58075837
dependencies = [
58085838
"leb128",
5809-
"wasmparser 0.217.0",
5839+
"wasmparser 0.218.0",
58105840
]
58115841

58125842
[[package]]
58135843
name = "wasm-metadata"
5814-
version = "0.217.0"
5844+
version = "0.218.0"
58155845
source = "registry+https://github.com/rust-lang/crates.io-index"
5816-
checksum = "65a146bf9a60e9264f0548a2599aa9656dba9a641eff9ab88299dc2a637e483c"
5846+
checksum = "aa5eeb071abe8a2132fdd5565dabffee70775ee8c24fc7e300ac43f51f4a8a91"
58175847
dependencies = [
58185848
"anyhow",
58195849
"indexmap",
58205850
"serde",
58215851
"serde_derive",
58225852
"serde_json",
58235853
"spdx",
5824-
"wasm-encoder 0.217.0",
5825-
"wasmparser 0.217.0",
5854+
"wasm-encoder 0.218.0",
5855+
"wasmparser 0.218.0",
58265856
]
58275857

58285858
[[package]]
@@ -5837,9 +5867,9 @@ dependencies = [
58375867

58385868
[[package]]
58395869
name = "wasmparser"
5840-
version = "0.217.0"
5870+
version = "0.218.0"
58415871
source = "registry+https://github.com/rust-lang/crates.io-index"
5842-
checksum = "ca917a21307d3adf2b9857b94dd05ebf8496bdcff4437a9b9fb3899d3e6c74e7"
5872+
checksum = "b09e46c7fceceaa72b2dd1a8a137ea7fd8f93dfaa69806010a709918e496c5dc"
58435873
dependencies = [
58445874
"ahash",
58455875
"bitflags 2.6.0",
@@ -5851,22 +5881,22 @@ dependencies = [
58515881

58525882
[[package]]
58535883
name = "wast"
5854-
version = "217.0.0"
5884+
version = "218.0.0"
58555885
source = "registry+https://github.com/rust-lang/crates.io-index"
5856-
checksum = "79004ecebded92d3c710d4841383368c7f04b63d0992ddd6b0c7d5029b7629b7"
5886+
checksum = "8a53cd1f0fa505df97557e36a58bddb8296e2fcdcd089529545ebfdb18a1b9d7"
58575887
dependencies = [
58585888
"bumpalo",
58595889
"leb128",
58605890
"memchr",
58615891
"unicode-width",
5862-
"wasm-encoder 0.217.0",
5892+
"wasm-encoder 0.218.0",
58635893
]
58645894

58655895
[[package]]
58665896
name = "wat"
5867-
version = "1.217.0"
5897+
version = "1.218.0"
58685898
source = "registry+https://github.com/rust-lang/crates.io-index"
5869-
checksum = "c126271c3d92ca0f7c63e4e462e40c69cca52fd4245fcda730d1cf558fb55088"
5899+
checksum = "4f87f8e14e776762e07927c27c2054d2cf678aab9aae2d431a79b3e31e4dd391"
58705900
dependencies = [
58715901
"wast",
58725902
]
@@ -6143,9 +6173,9 @@ dependencies = [
61436173

61446174
[[package]]
61456175
name = "wit-component"
6146-
version = "0.217.0"
6176+
version = "0.218.0"
61476177
source = "registry+https://github.com/rust-lang/crates.io-index"
6148-
checksum = "d7117809905e49db716d81e794f79590c052bf2fdbbcda1731ca0fb28f6f3ddf"
6178+
checksum = "aa53aa7e6bf2b3e8ccaffbcc963fbdb672a603dc0af393a481b6cec24c266406"
61496179
dependencies = [
61506180
"anyhow",
61516181
"bitflags 2.6.0",
@@ -6154,17 +6184,17 @@ dependencies = [
61546184
"serde",
61556185
"serde_derive",
61566186
"serde_json",
6157-
"wasm-encoder 0.217.0",
6187+
"wasm-encoder 0.218.0",
61586188
"wasm-metadata",
6159-
"wasmparser 0.217.0",
6189+
"wasmparser 0.218.0",
61606190
"wit-parser",
61616191
]
61626192

61636193
[[package]]
61646194
name = "wit-parser"
6165-
version = "0.217.0"
6195+
version = "0.218.0"
61666196
source = "registry+https://github.com/rust-lang/crates.io-index"
6167-
checksum = "fb893dcd6d370cfdf19a0d9adfcd403efb8e544e1a0ea3a8b81a21fe392eaa78"
6197+
checksum = "0d3d1066ab761b115f97fef2b191090faabcb0f37b555b758d3caf42d4ed9e55"
61686198
dependencies = [
61696199
"anyhow",
61706200
"id-arena",
@@ -6175,7 +6205,7 @@ dependencies = [
61756205
"serde_derive",
61766206
"serde_json",
61776207
"unicode-xid",
6178-
"wasmparser 0.217.0",
6208+
"wasmparser 0.218.0",
61796209
]
61806210

61816211
[[package]]

compiler/rustc_ast_lowering/src/item.rs

-2
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
286286
parent: this.local_def_id(id),
287287
in_assoc_ty: false,
288288
},
289-
fn_kind: None,
290289
}),
291290
},
292291
);
@@ -983,7 +982,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
983982
parent: this.local_def_id(i.id),
984983
in_assoc_ty: true,
985984
},
986-
fn_kind: None,
987985
});
988986
hir::ImplItemKind::Type(ty)
989987
}

0 commit comments

Comments
 (0)