Skip to content

Commit a46ccba

Browse files
committed
Auto merge of rust-lang#2618 - RalfJung:rustup, r=RalfJung
Rustup
2 parents cfd99a2 + 5a5a3e4 commit a46ccba

File tree

802 files changed

+20813
-10342
lines changed

Some content is hidden

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

802 files changed

+20813
-10342
lines changed

Cargo.lock

+47-10
Original file line numberDiff line numberDiff line change
@@ -1843,9 +1843,9 @@ dependencies = [
18431843

18441844
[[package]]
18451845
name = "itertools"
1846-
version = "0.10.1"
1846+
version = "0.10.5"
18471847
source = "registry+https://github.com/rust-lang/crates.io-index"
1848-
checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
1848+
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
18491849
dependencies = [
18501850
"either",
18511851
]
@@ -1935,9 +1935,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
19351935

19361936
[[package]]
19371937
name = "libc"
1938-
version = "0.2.131"
1938+
version = "0.2.135"
19391939
source = "registry+https://github.com/rust-lang/crates.io-index"
1940-
checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40"
1940+
checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
19411941
dependencies = [
19421942
"rustc-std-workspace-core",
19431943
]
@@ -3569,6 +3569,32 @@ dependencies = [
35693569
"rustc_target",
35703570
]
35713571

3572+
[[package]]
3573+
name = "rustc_hir_typeck"
3574+
version = "0.1.0"
3575+
dependencies = [
3576+
"rustc_ast",
3577+
"rustc_data_structures",
3578+
"rustc_errors",
3579+
"rustc_graphviz",
3580+
"rustc_hir",
3581+
"rustc_hir_analysis",
3582+
"rustc_hir_pretty",
3583+
"rustc_index",
3584+
"rustc_infer",
3585+
"rustc_lint",
3586+
"rustc_macros",
3587+
"rustc_middle",
3588+
"rustc_serialize",
3589+
"rustc_session",
3590+
"rustc_span",
3591+
"rustc_target",
3592+
"rustc_trait_selection",
3593+
"rustc_type_ir",
3594+
"smallvec",
3595+
"tracing",
3596+
]
3597+
35723598
[[package]]
35733599
name = "rustc_incremental"
35743600
version = "0.0.0"
@@ -3638,6 +3664,7 @@ dependencies = [
36383664
"rustc_expand",
36393665
"rustc_hir",
36403666
"rustc_hir_analysis",
3667+
"rustc_hir_typeck",
36413668
"rustc_incremental",
36423669
"rustc_lint",
36433670
"rustc_macros",
@@ -4449,9 +4476,9 @@ dependencies = [
44494476

44504477
[[package]]
44514478
name = "serde"
4452-
version = "1.0.143"
4479+
version = "1.0.147"
44534480
source = "registry+https://github.com/rust-lang/crates.io-index"
4454-
checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
4481+
checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
44554482
dependencies = [
44564483
"serde_derive",
44574484
]
@@ -4468,9 +4495,9 @@ dependencies = [
44684495

44694496
[[package]]
44704497
name = "serde_derive"
4471-
version = "1.0.143"
4498+
version = "1.0.147"
44724499
source = "registry+https://github.com/rust-lang/crates.io-index"
4473-
checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
4500+
checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
44744501
dependencies = [
44754502
"proc-macro2",
44764503
"quote",
@@ -4953,17 +4980,27 @@ dependencies = [
49534980
"serde",
49544981
]
49554982

4983+
[[package]]
4984+
name = "toml_datetime"
4985+
version = "0.5.0"
4986+
source = "registry+https://github.com/rust-lang/crates.io-index"
4987+
checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd"
4988+
dependencies = [
4989+
"serde",
4990+
]
4991+
49564992
[[package]]
49574993
name = "toml_edit"
4958-
version = "0.14.3"
4994+
version = "0.15.0"
49594995
source = "registry+https://github.com/rust-lang/crates.io-index"
4960-
checksum = "ba98375fd631b83696f87c64e4ed8e29e6a1f3404d6aed95fa95163bad38e705"
4996+
checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646"
49614997
dependencies = [
49624998
"combine",
49634999
"indexmap",
49645000
"itertools",
49655001
"kstring",
49665002
"serde",
5003+
"toml_datetime",
49675004
]
49685005

49695006
[[package]]

compiler/rustc/src/main.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![feature(unix_sigpipe)]
2+
13
// A note about jemalloc: rustc uses jemalloc when built for CI and
24
// distribution. The obvious way to do this is with the `#[global_allocator]`
35
// mechanism. However, for complicated reasons (see
@@ -23,6 +25,7 @@
2325
// libraries. So we must reference jemalloc symbols one way or another, because
2426
// this file is the only object code in the rustc executable.
2527

28+
#[unix_sigpipe = "sig_dfl"]
2629
fn main() {
2730
// See the comment at the top of this file for an explanation of this.
2831
#[cfg(feature = "jemalloc-sys")]
@@ -58,6 +61,5 @@ fn main() {
5861
}
5962
}
6063

61-
rustc_driver::set_sigpipe_handler();
6264
rustc_driver::main()
6365
}

0 commit comments

Comments
 (0)