Skip to content

Commit ffe01c3

Browse files
committed
Revert to 14dbfeb
1 parent ea6ab1b commit ffe01c3

File tree

2,927 files changed

+20877
-375433
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,927 files changed

+20877
-375433
lines changed

.github/ISSUE_TEMPLATE/documentation.md

+1-16
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,13 @@ about: Create a report for a documentation problem.
44
labels: A-docs
55
---
66
<!--
7-
87
Thank you for finding a documentation problem! 📚
98
109
Documentation problems might be grammatical issues, typos, or unclear wording, please provide details regarding the documentation including where it is present.
1110
12-
Note: If your issue is for one of these, please use their dedicated issue tracker instead:
13-
14-
- The Rust Book: https://github.com/rust-lang/book/issues
15-
- Rust by Example: https://github.com/rust-lang/rust-by-example/issues
16-
- The Edition Guide: https://github.com/rust-lang/edition-guide/issues
17-
- The Cargo Book: https://github.com/rust-lang/cargo/issues
18-
- The Clippy Book: https://github.com/rust-lang/rust-clippy/issues
19-
- The Reference: https://github.com/rust-lang/reference/issues
20-
- The Rustonomicon: https://github.com/rust-lang/nomicon/issues
21-
- The Embedded Book: https://github.com/rust-embedded/book/issues
22-
23-
All other documentation issues should be filed here.
24-
25-
Or, if you find an issue related to rustdoc (e.g. doctest, rustdoc UI), please use the bug report or blank issue template instead.
26-
2711
-->
2812

2913
### Location
3014

3115
### Summary
16+

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book
4040
url = https://github.com/rust-embedded/book.git
41+
[submodule "src/tools/rust-analyzer"]
42+
path = src/tools/rust-analyzer
43+
url = https://github.com/rust-analyzer/rust-analyzer.git
4144
[submodule "library/backtrace"]
4245
path = library/backtrace
4346
url = https://github.com/rust-lang/backtrace-rs.git

Cargo.lock

+59-54
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ dependencies = [
202202

203203
[[package]]
204204
name = "bitflags"
205-
version = "1.3.2"
205+
version = "1.2.1"
206206
source = "registry+https://github.com/rust-lang/crates.io-index"
207-
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
207+
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
208208

209209
[[package]]
210210
name = "bitmaps"
@@ -319,9 +319,9 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"
319319

320320
[[package]]
321321
name = "camino"
322-
version = "1.0.9"
322+
version = "1.0.5"
323323
source = "registry+https://github.com/rust-lang/crates.io-index"
324-
checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412"
324+
checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b"
325325
dependencies = [
326326
"serde",
327327
]
@@ -506,19 +506,6 @@ dependencies = [
506506
"serde_json",
507507
]
508508

509-
[[package]]
510-
name = "cargo_metadata"
511-
version = "0.15.0"
512-
source = "registry+https://github.com/rust-lang/crates.io-index"
513-
checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36"
514-
dependencies = [
515-
"camino",
516-
"cargo-platform 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
517-
"semver",
518-
"serde",
519-
"serde_json",
520-
]
521-
522509
[[package]]
523510
name = "cargotest2"
524511
version = "0.1.0"
@@ -689,7 +676,6 @@ dependencies = [
689676
"tester",
690677
"tokio",
691678
"toml",
692-
"walkdir",
693679
]
694680

695681
[[package]]
@@ -710,7 +696,7 @@ dependencies = [
710696
name = "clippy_lints"
711697
version = "0.1.64"
712698
dependencies = [
713-
"cargo_metadata 0.14.0",
699+
"cargo_metadata",
714700
"clippy_utils",
715701
"if_chain",
716702
"itertools",
@@ -1727,9 +1713,18 @@ dependencies = [
17271713

17281714
[[package]]
17291715
name = "hashbrown"
1730-
version = "0.12.3"
1716+
version = "0.11.2"
17311717
source = "registry+https://github.com/rust-lang/crates.io-index"
1732-
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1718+
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
1719+
dependencies = [
1720+
"ahash",
1721+
]
1722+
1723+
[[package]]
1724+
name = "hashbrown"
1725+
version = "0.12.0"
1726+
source = "registry+https://github.com/rust-lang/crates.io-index"
1727+
checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
17331728
dependencies = [
17341729
"ahash",
17351730
"compiler_builtins",
@@ -1888,12 +1883,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
18881883

18891884
[[package]]
18901885
name = "indexmap"
1891-
version = "1.9.1"
1886+
version = "1.8.2"
18921887
source = "registry+https://github.com/rust-lang/crates.io-index"
1893-
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
1888+
checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
18941889
dependencies = [
18951890
"autocfg",
1896-
"hashbrown",
1891+
"hashbrown 0.11.2",
18971892
"rustc-rayon",
18981893
"serde",
18991894
]
@@ -1964,9 +1959,9 @@ dependencies = [
19641959

19651960
[[package]]
19661961
name = "itoa"
1967-
version = "1.0.2"
1962+
version = "0.4.6"
19681963
source = "registry+https://github.com/rust-lang/crates.io-index"
1969-
checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
1964+
checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
19701965

19711966
[[package]]
19721967
name = "jemalloc-sys"
@@ -2353,9 +2348,9 @@ dependencies = [
23532348

23542349
[[package]]
23552350
name = "mdbook"
2356-
version = "0.4.21"
2351+
version = "0.4.20"
23572352
source = "registry+https://github.com/rust-lang/crates.io-index"
2358-
checksum = "23f3e133c6d515528745ffd3b9f0c7d975ae039f0b6abb099f2168daa2afb4f9"
2353+
checksum = "13cdad8057b09a519c6c63e6d7c93ea854f5d7fbfe284df864d5e1140d215a2d"
23592354
dependencies = [
23602355
"ammonia",
23612356
"anyhow",
@@ -2381,9 +2376,9 @@ dependencies = [
23812376

23822377
[[package]]
23832378
name = "measureme"
2384-
version = "10.1.0"
2379+
version = "10.0.0"
23852380
source = "registry+https://github.com/rust-lang/crates.io-index"
2386-
checksum = "cbdc226fa10994e8f66a4d2f6f000148bc563a1c671b6dcd2135737018033d8a"
2381+
checksum = "bd460fad6e55ca82fa0cd9dab0d315294188fd9ec6efbf4105e5635d4872ef9c"
23872382
dependencies = [
23882383
"log",
23892384
"memmap2",
@@ -2395,9 +2390,9 @@ dependencies = [
23952390

23962391
[[package]]
23972392
name = "memchr"
2398-
version = "2.5.0"
2393+
version = "2.4.1"
23992394
source = "registry+https://github.com/rust-lang/crates.io-index"
2400-
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
2395+
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
24012396
dependencies = [
24022397
"compiler_builtins",
24032398
"rustc-std-workspace-core",
@@ -2568,15 +2563,27 @@ dependencies = [
25682563
"rustc-std-workspace-core",
25692564
]
25702565

2566+
[[package]]
2567+
name = "object"
2568+
version = "0.28.4"
2569+
source = "registry+https://github.com/rust-lang/crates.io-index"
2570+
checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
2571+
dependencies = [
2572+
"crc32fast",
2573+
"flate2",
2574+
"hashbrown 0.11.2",
2575+
"indexmap",
2576+
"memchr",
2577+
]
2578+
25712579
[[package]]
25722580
name = "object"
25732581
version = "0.29.0"
25742582
source = "registry+https://github.com/rust-lang/crates.io-index"
25752583
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
25762584
dependencies = [
25772585
"crc32fast",
2578-
"flate2",
2579-
"hashbrown",
2586+
"hashbrown 0.12.0",
25802587
"indexmap",
25812588
"memchr",
25822589
]
@@ -3045,9 +3052,9 @@ dependencies = [
30453052

30463053
[[package]]
30473054
name = "pulldown-cmark"
3048-
version = "0.9.2"
3055+
version = "0.9.1"
30493056
source = "registry+https://github.com/rust-lang/crates.io-index"
3050-
checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
3057+
checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6"
30513058
dependencies = [
30523059
"bitflags",
30533060
"memchr",
@@ -3309,7 +3316,7 @@ dependencies = [
33093316
"anyhow",
33103317
"cargo",
33113318
"cargo-util",
3312-
"cargo_metadata 0.14.0",
3319+
"cargo_metadata",
33133320
"clippy_lints",
33143321
"crossbeam-channel",
33153322
"difference",
@@ -4499,7 +4506,6 @@ dependencies = [
44994506
name = "rustc_symbol_mangling"
45004507
version = "0.0.0"
45014508
dependencies = [
4502-
"bitflags",
45034509
"punycode",
45044510
"rustc-demangle",
45054511
"rustc_data_structures",
@@ -4717,7 +4723,7 @@ dependencies = [
47174723
"annotate-snippets 0.9.1",
47184724
"anyhow",
47194725
"bytecount",
4720-
"cargo_metadata 0.14.0",
4726+
"cargo_metadata",
47214727
"clap",
47224728
"derive-new",
47234729
"diff",
@@ -4815,27 +4821,27 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"
48154821

48164822
[[package]]
48174823
name = "semver"
4818-
version = "1.0.12"
4824+
version = "1.0.3"
48194825
source = "registry+https://github.com/rust-lang/crates.io-index"
4820-
checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
4826+
checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe"
48214827
dependencies = [
48224828
"serde",
48234829
]
48244830

48254831
[[package]]
48264832
name = "serde"
4827-
version = "1.0.140"
4833+
version = "1.0.125"
48284834
source = "registry+https://github.com/rust-lang/crates.io-index"
4829-
checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
4835+
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
48304836
dependencies = [
48314837
"serde_derive",
48324838
]
48334839

48344840
[[package]]
48354841
name = "serde_derive"
4836-
version = "1.0.140"
4842+
version = "1.0.125"
48374843
source = "registry+https://github.com/rust-lang/crates.io-index"
4838-
checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
4844+
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
48394845
dependencies = [
48404846
"proc-macro2",
48414847
"quote",
@@ -4853,9 +4859,9 @@ dependencies = [
48534859

48544860
[[package]]
48554861
name = "serde_json"
4856-
version = "1.0.82"
4862+
version = "1.0.59"
48574863
source = "registry+https://github.com/rust-lang/crates.io-index"
4858-
checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
4864+
checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95"
48594865
dependencies = [
48604866
"indexmap",
48614867
"itoa",
@@ -5048,7 +5054,7 @@ dependencies = [
50485054
"core",
50495055
"dlmalloc",
50505056
"fortanix-sgx-abi",
5051-
"hashbrown",
5057+
"hashbrown 0.12.0",
50525058
"hermit-abi 0.2.0",
50535059
"libc",
50545060
"miniz_oxide 0.4.0",
@@ -5259,13 +5265,13 @@ dependencies = [
52595265

52605266
[[package]]
52615267
name = "thorin-dwp"
5262-
version = "0.3.0"
5268+
version = "0.2.0"
52635269
source = "registry+https://github.com/rust-lang/crates.io-index"
5264-
checksum = "e6cb0c7868d7f90407531108ab03263d9452a8811b7cdd87675343a40d4aa254"
5270+
checksum = "dd95b4559c196987c8451b4e14d08a4c796c2844f9adf4d2a2dbc9b3142843be"
52655271
dependencies = [
52665272
"gimli 0.26.1",
5267-
"hashbrown",
5268-
"object 0.29.0",
5273+
"hashbrown 0.11.2",
5274+
"object 0.28.4",
52695275
"tracing",
52705276
]
52715277

@@ -5282,7 +5288,7 @@ dependencies = [
52825288
name = "tidy"
52835289
version = "0.1.0"
52845290
dependencies = [
5285-
"cargo_metadata 0.14.0",
5291+
"cargo_metadata",
52865292
"crossbeam-utils",
52875293
"lazy_static",
52885294
"regex",
@@ -5512,7 +5518,6 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
55125518
name = "ui_test"
55135519
version = "0.1.0"
55145520
dependencies = [
5515-
"cargo_metadata 0.15.0",
55165521
"color-eyre",
55175522
"colored",
55185523
"crossbeam",

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ exclude = [
6060
# verify that this is the case. This requires, however, that the crate is built
6161
# without overflow checks and debug assertions. Forcefully disable debug
6262
# assertions and overflow checks here which should ensure that even if these
63-
# assertions are enabled for libstd we won't enable them for compiler_builtins
63+
# assertions are enabled for libstd we won't enable then for compiler_builtins
6464
# which should ensure we still link everything correctly.
6565
debug-assertions = false
6666
overflow-checks = false

compiler/rustc_ast_lowering/src/asm.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ use super::LoweringContext;
44

55
use rustc_ast::ptr::P;
66
use rustc_ast::*;
7-
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
7+
use rustc_data_structures::fx::FxHashMap;
8+
use rustc_data_structures::stable_set::FxHashSet;
89
use rustc_errors::struct_span_err;
910
use rustc_hir as hir;
1011
use rustc_hir::def::{DefKind, Res};

0 commit comments

Comments
 (0)