Skip to content

Commit 6efdf4d

Browse files
committed
Merge from rustc
2 parents 0bb6d66 + d4be8ef commit 6efdf4d

File tree

958 files changed

+10687
-9418
lines changed

Some content is hidden

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

958 files changed

+10687
-9418
lines changed

.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ trim_trailing_whitespace = true
1111
insert_final_newline = true
1212
indent_style = space
1313
indent_size = 4
14+
max_line_length = 100
1415

1516
[*.md]
1617
# double whitespace at end of line

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
[submodule "src/llvm-project"]
2626
path = src/llvm-project
2727
url = https://github.com/rust-lang/llvm-project.git
28-
branch = rustc/16.0-2023-03-06
28+
branch = rustc/16.0-2023-04-05
2929
[submodule "src/doc/embedded-book"]
3030
path = src/doc/embedded-book
3131
url = https://github.com/rust-embedded/book.git

Cargo.lock

+42-26
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ dependencies = [
632632
"proc-macro2",
633633
"quote",
634634
"syn 1.0.102",
635-
"synstructure",
635+
"synstructure 0.12.6",
636636
]
637637

638638
[[package]]
@@ -1418,9 +1418,9 @@ dependencies = [
14181418

14191419
[[package]]
14201420
name = "elsa"
1421-
version = "1.8.0"
1421+
version = "1.7.1"
14221422
source = "registry+https://github.com/rust-lang/crates.io-index"
1423-
checksum = "f74077c3c3aedb99a2683919698285596662518ea13e5eedcf8bdd43b0d0453b"
1423+
checksum = "848fe615fbb0a74d9ae68dcaa510106d32e37d9416207bbea4bd008bd89c47ed"
14241424
dependencies = [
14251425
"stable_deref_trait",
14261426
]
@@ -1673,12 +1673,6 @@ version = "2.8.1"
16731673
source = "registry+https://github.com/rust-lang/crates.io-index"
16741674
checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50"
16751675

1676-
[[package]]
1677-
name = "fs_extra"
1678-
version = "1.1.0"
1679-
source = "registry+https://github.com/rust-lang/crates.io-index"
1680-
checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
1681-
16821676
[[package]]
16831677
name = "futf"
16841678
version = "0.1.5"
@@ -2861,12 +2855,11 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
28612855

28622856
[[package]]
28632857
name = "jemalloc-sys"
2864-
version = "0.5.0+5.3.0"
2858+
version = "0.5.3+5.3.0-patched"
28652859
source = "registry+https://github.com/rust-lang/crates.io-index"
2866-
checksum = "f655c3ecfa6b0d03634595b4b54551d4bd5ac208b9e0124873949a7ab168f70b"
2860+
checksum = "f9bd5d616ea7ed58b571b2e209a65759664d7fb021a0819d7a790afc67e47ca1"
28672861
dependencies = [
28682862
"cc",
2869-
"fs_extra",
28702863
"libc",
28712864
]
28722865

@@ -3475,18 +3468,30 @@ dependencies = [
34753468

34763469
[[package]]
34773470
name = "openssl"
3478-
version = "0.10.38"
3471+
version = "0.10.49"
34793472
source = "registry+https://github.com/rust-lang/crates.io-index"
3480-
checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
3473+
checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33"
34813474
dependencies = [
34823475
"bitflags",
34833476
"cfg-if",
34843477
"foreign-types",
34853478
"libc",
34863479
"once_cell",
3480+
"openssl-macros",
34873481
"openssl-sys",
34883482
]
34893483

3484+
[[package]]
3485+
name = "openssl-macros"
3486+
version = "0.1.1"
3487+
source = "registry+https://github.com/rust-lang/crates.io-index"
3488+
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
3489+
dependencies = [
3490+
"proc-macro2",
3491+
"quote",
3492+
"syn 2.0.8",
3493+
]
3494+
34903495
[[package]]
34913496
name = "openssl-probe"
34923497
version = "0.1.5"
@@ -3495,20 +3500,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
34953500

34963501
[[package]]
34973502
name = "openssl-src"
3498-
version = "111.22.0+1.1.1q"
3503+
version = "111.25.0+1.1.1t"
34993504
source = "registry+https://github.com/rust-lang/crates.io-index"
3500-
checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
3505+
checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
35013506
dependencies = [
35023507
"cc",
35033508
]
35043509

35053510
[[package]]
35063511
name = "openssl-sys"
3507-
version = "0.9.72"
3512+
version = "0.9.84"
35083513
source = "registry+https://github.com/rust-lang/crates.io-index"
3509-
checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
3514+
checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa"
35103515
dependencies = [
3511-
"autocfg",
35123516
"cc",
35133517
"libc",
35143518
"openssl-src",
@@ -4178,7 +4182,7 @@ name = "rustbook"
41784182
version = "0.1.0"
41794183
dependencies = [
41804184
"clap 4.2.1",
4181-
"env_logger 0.7.1",
4185+
"env_logger 0.10.0",
41824186
"mdbook",
41834187
]
41844188

@@ -4994,8 +4998,8 @@ dependencies = [
49944998
"fluent-syntax",
49954999
"proc-macro2",
49965000
"quote",
4997-
"syn 1.0.102",
4998-
"synstructure",
5001+
"syn 2.0.8",
5002+
"synstructure 0.13.0",
49995003
"unic-langid",
50005004
]
50015005

@@ -6131,6 +6135,18 @@ dependencies = [
61316135
"unicode-xid",
61326136
]
61336137

6138+
[[package]]
6139+
name = "synstructure"
6140+
version = "0.13.0"
6141+
source = "registry+https://github.com/rust-lang/crates.io-index"
6142+
checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06"
6143+
dependencies = [
6144+
"proc-macro2",
6145+
"quote",
6146+
"syn 2.0.8",
6147+
"unicode-xid",
6148+
]
6149+
61346150
[[package]]
61356151
name = "tar"
61366152
version = "0.4.38"
@@ -6299,7 +6315,7 @@ name = "tidy"
62996315
version = "0.1.0"
63006316
dependencies = [
63016317
"cargo-platform 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
6302-
"cargo_metadata 0.14.0",
6318+
"cargo_metadata 0.15.3",
63036319
"ignore",
63046320
"lazy_static",
63056321
"miropt-test-tools",
@@ -7154,7 +7170,7 @@ dependencies = [
71547170
"proc-macro2",
71557171
"quote",
71567172
"syn 1.0.102",
7157-
"synstructure",
7173+
"synstructure 0.12.6",
71587174
]
71597175

71607176
[[package]]
@@ -7175,7 +7191,7 @@ dependencies = [
71757191
"proc-macro2",
71767192
"quote",
71777193
"syn 1.0.102",
7178-
"synstructure",
7194+
"synstructure 0.12.6",
71797195
]
71807196

71817197
[[package]]
@@ -7204,5 +7220,5 @@ dependencies = [
72047220
"proc-macro2",
72057221
"quote",
72067222
"syn 1.0.102",
7207-
"synstructure",
7223+
"synstructure 0.12.6",
72087224
]

0 commit comments

Comments
 (0)