Skip to content

Commit 09b1611

Browse files
Billy-SheppardBilly-Sheppard
authored
Merge branch 'rust-lang:master' into master
2 parents fec5b27 + d287f3e commit 09b1611

File tree

677 files changed

+8895
-5596
lines changed

Some content is hidden

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

677 files changed

+8895
-5596
lines changed

‎Cargo.lock

+87-21
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,28 @@ dependencies = [
512512
"windows-targets 0.52.4",
513513
]
514514

515+
[[package]]
516+
name = "chrono-tz"
517+
version = "0.9.0"
518+
source = "registry+https://github.com/rust-lang/crates.io-index"
519+
checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
520+
dependencies = [
521+
"chrono",
522+
"chrono-tz-build",
523+
"phf 0.11.2",
524+
]
525+
526+
[[package]]
527+
name = "chrono-tz-build"
528+
version = "0.3.0"
529+
source = "registry+https://github.com/rust-lang/crates.io-index"
530+
checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
531+
dependencies = [
532+
"parse-zoneinfo",
533+
"phf 0.11.2",
534+
"phf_codegen 0.11.2",
535+
]
536+
515537
[[package]]
516538
name = "cipher"
517539
version = "0.4.4"
@@ -2197,7 +2219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21972219
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
21982220
dependencies = [
21992221
"cfg-if",
2200-
"windows-targets 0.52.4",
2222+
"windows-targets 0.48.5",
22012223
]
22022224

22032225
[[package]]
@@ -2318,8 +2340,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
23182340
checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
23192341
dependencies = [
23202342
"log",
2321-
"phf",
2322-
"phf_codegen",
2343+
"phf 0.10.1",
2344+
"phf_codegen 0.10.0",
23232345
"string_cache",
23242346
"string_cache_codegen",
23252347
"tendril",
@@ -2480,6 +2502,7 @@ version = "0.1.0"
24802502
dependencies = [
24812503
"aes",
24822504
"chrono",
2505+
"chrono-tz",
24832506
"colored",
24842507
"ctrlc",
24852508
"directories",
@@ -2835,6 +2858,15 @@ dependencies = [
28352858
"windows-targets 0.48.5",
28362859
]
28372860

2861+
[[package]]
2862+
name = "parse-zoneinfo"
2863+
version = "0.3.1"
2864+
source = "registry+https://github.com/rust-lang/crates.io-index"
2865+
checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
2866+
dependencies = [
2867+
"regex",
2868+
]
2869+
28382870
[[package]]
28392871
name = "pathdiff"
28402872
version = "0.2.1"
@@ -2907,7 +2939,16 @@ version = "0.10.1"
29072939
source = "registry+https://github.com/rust-lang/crates.io-index"
29082940
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
29092941
dependencies = [
2910-
"phf_shared",
2942+
"phf_shared 0.10.0",
2943+
]
2944+
2945+
[[package]]
2946+
name = "phf"
2947+
version = "0.11.2"
2948+
source = "registry+https://github.com/rust-lang/crates.io-index"
2949+
checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
2950+
dependencies = [
2951+
"phf_shared 0.11.2",
29112952
]
29122953

29132954
[[package]]
@@ -2916,8 +2957,18 @@ version = "0.10.0"
29162957
source = "registry+https://github.com/rust-lang/crates.io-index"
29172958
checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
29182959
dependencies = [
2919-
"phf_generator",
2920-
"phf_shared",
2960+
"phf_generator 0.10.0",
2961+
"phf_shared 0.10.0",
2962+
]
2963+
2964+
[[package]]
2965+
name = "phf_codegen"
2966+
version = "0.11.2"
2967+
source = "registry+https://github.com/rust-lang/crates.io-index"
2968+
checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
2969+
dependencies = [
2970+
"phf_generator 0.11.2",
2971+
"phf_shared 0.11.2",
29212972
]
29222973

29232974
[[package]]
@@ -2926,7 +2977,17 @@ version = "0.10.0"
29262977
source = "registry+https://github.com/rust-lang/crates.io-index"
29272978
checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
29282979
dependencies = [
2929-
"phf_shared",
2980+
"phf_shared 0.10.0",
2981+
"rand",
2982+
]
2983+
2984+
[[package]]
2985+
name = "phf_generator"
2986+
version = "0.11.2"
2987+
source = "registry+https://github.com/rust-lang/crates.io-index"
2988+
checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
2989+
dependencies = [
2990+
"phf_shared 0.11.2",
29302991
"rand",
29312992
]
29322993

@@ -2939,6 +3000,15 @@ dependencies = [
29393000
"siphasher",
29403001
]
29413002

3003+
[[package]]
3004+
name = "phf_shared"
3005+
version = "0.11.2"
3006+
source = "registry+https://github.com/rust-lang/crates.io-index"
3007+
checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
3008+
dependencies = [
3009+
"siphasher",
3010+
]
3011+
29423012
[[package]]
29433013
name = "pin-project-lite"
29443014
version = "0.2.14"
@@ -3354,9 +3424,9 @@ dependencies = [
33543424

33553425
[[package]]
33563426
name = "rustc-build-sysroot"
3357-
version = "0.4.6"
3427+
version = "0.4.7"
33583428
source = "registry+https://github.com/rust-lang/crates.io-index"
3359-
checksum = "a9bf37423495cd3a6a9ef8c75fc4566de0d26de0ab75f36f67a426e58df5768c"
3429+
checksum = "ab1dbbd1bdf65fdac44c885f6cca147ba179108ce284b60a08ccc04b1f1dbac0"
33603430
dependencies = [
33613431
"anyhow",
33623432
"rustc_version",
@@ -3824,7 +3894,6 @@ dependencies = [
38243894
"rustc_session",
38253895
"rustc_smir",
38263896
"rustc_span",
3827-
"rustc_symbol_mangling",
38283897
"rustc_target",
38293898
"rustc_trait_selection",
38303899
"rustc_ty_utils",
@@ -3907,7 +3976,6 @@ dependencies = [
39073976
"rustc_session",
39083977
"rustc_span",
39093978
"smallvec",
3910-
"termcolor",
39113979
"thin-vec",
39123980
"tracing",
39133981
]
@@ -4008,7 +4076,6 @@ dependencies = [
40084076
"rustc_data_structures",
40094077
"rustc_errors",
40104078
"rustc_fluent_macro",
4011-
"rustc_graphviz",
40124079
"rustc_hir",
40134080
"rustc_hir_analysis",
40144081
"rustc_hir_pretty",
@@ -4396,6 +4463,7 @@ dependencies = [
43964463
"rustc_macros",
43974464
"rustc_session",
43984465
"rustc_span",
4466+
"termcolor",
43994467
"thin-vec",
44004468
"tracing",
44014469
"unicode-normalization",
@@ -4468,7 +4536,6 @@ dependencies = [
44684536
"rustc_errors",
44694537
"rustc_fluent_macro",
44704538
"rustc_hir",
4471-
"rustc_hir_analysis",
44724539
"rustc_macros",
44734540
"rustc_middle",
44744541
"rustc_session",
@@ -4515,7 +4582,6 @@ dependencies = [
45154582
"rustc_session",
45164583
"rustc_span",
45174584
"rustc_target",
4518-
"rustc_type_ir",
45194585
"smallvec",
45204586
"thin-vec",
45214587
"tracing",
@@ -5289,7 +5355,7 @@ dependencies = [
52895355
"new_debug_unreachable",
52905356
"once_cell",
52915357
"parking_lot",
5292-
"phf_shared",
5358+
"phf_shared 0.10.0",
52935359
"precomputed-hash",
52945360
"serde",
52955361
]
@@ -5300,8 +5366,8 @@ version = "0.5.2"
53005366
source = "registry+https://github.com/rust-lang/crates.io-index"
53015367
checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
53025368
dependencies = [
5303-
"phf_generator",
5304-
"phf_shared",
5369+
"phf_generator 0.10.0",
5370+
"phf_shared 0.10.0",
53055371
"proc-macro2",
53065372
"quote",
53075373
]
@@ -5601,9 +5667,9 @@ version = "0.1.0"
56015667

56025668
[[package]]
56035669
name = "time"
5604-
version = "0.3.34"
5670+
version = "0.3.36"
56055671
source = "registry+https://github.com/rust-lang/crates.io-index"
5606-
checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
5672+
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
56075673
dependencies = [
56085674
"deranged",
56095675
"itoa",
@@ -5622,9 +5688,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
56225688

56235689
[[package]]
56245690
name = "time-macros"
5625-
version = "0.2.17"
5691+
version = "0.2.18"
56265692
source = "registry+https://github.com/rust-lang/crates.io-index"
5627-
checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
5693+
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
56285694
dependencies = [
56295695
"num-conv",
56305696
"time-core",

‎RELEASES.md

+4
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ Compatibility Notes
102102
- [Change equality of higher ranked types to not rely on subtyping](https://github.com/rust-lang/rust/pull/118247)
103103
- [When called, additionally check bounds on normalized function return type](https://github.com/rust-lang/rust/pull/118882)
104104
- [Expand coverage for `arithmetic_overflow` lint](https://github.com/rust-lang/rust/pull/119432/)
105+
- [Fix detection of potential interior mutability in `const` initializers](https://github.com/rust-lang/rust/issues/121250)
106+
This code was accidentally accepted. The fix can break generic code that borrows a value of unknown type,
107+
as there is currently no way to declare "this type has no interior mutability". In the future, stabilizing
108+
the [`Freeze` trait](https://github.com/rust-lang/rust/issues/121675) will allow proper support for such code.
105109

106110
<a id="1.78.0-Internal-Changes"></a>
107111

‎compiler/rustc/src/main.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(unix_sigpipe)]
2-
31
// A note about jemalloc: rustc uses jemalloc when built for CI and
42
// distribution. The obvious way to do this is with the `#[global_allocator]`
53
// mechanism. However, for complicated reasons (see
@@ -34,7 +32,6 @@
3432
// https://github.com/rust-lang/rust/commit/b90cfc887c31c3e7a9e6d462e2464db1fe506175#diff-43914724af6e464c1da2171e4a9b6c7e607d5bc1203fa95c0ab85be4122605ef
3533
// for an example of how to do so.
3634

37-
#[unix_sigpipe = "sig_dfl"]
3835
fn main() {
3936
// See the comment at the top of this file for an explanation of this.
4037
#[cfg(feature = "jemalloc-sys")]

‎compiler/rustc_abi/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ use rustc_macros::{Decodable_Generic, Encodable_Generic};
2121
use std::iter::Step;
2222

2323
mod layout;
24+
#[cfg(test)]
25+
mod tests;
2426

2527
pub use layout::LayoutCalculator;
2628

‎compiler/rustc_abi/src/tests.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
use super::*;
2+
3+
#[test]
4+
fn align_constants() {
5+
assert_eq!(Align::ONE, Align::from_bytes(1).unwrap());
6+
assert_eq!(Align::EIGHT, Align::from_bytes(8).unwrap());
7+
}

‎compiler/rustc_ast/src/ast.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,7 @@ pub struct StructExpr {
13901390
// Adding a new variant? Please update `test_expr` in `tests/ui/macros/stringify.rs`.
13911391
#[derive(Clone, Encodable, Decodable, Debug)]
13921392
pub enum ExprKind {
1393-
/// An array (`[a, b, c, d]`)
1393+
/// An array (e.g, `[a, b, c, d]`).
13941394
Array(ThinVec<P<Expr>>),
13951395
/// Allow anonymous constants from an inline `const` block
13961396
ConstBlock(AnonConst),
@@ -1401,7 +1401,7 @@ pub enum ExprKind {
14011401
/// This also represents calling the constructor of
14021402
/// tuple-like ADTs such as tuple structs and enum variants.
14031403
Call(P<Expr>, ThinVec<P<Expr>>),
1404-
/// A method call (e.g. `x.foo::<Bar, Baz>(a, b, c)`).
1404+
/// A method call (e.g., `x.foo::<Bar, Baz>(a, b, c)`).
14051405
MethodCall(Box<MethodCall>),
14061406
/// A tuple (e.g., `(a, b, c, d)`).
14071407
Tup(ThinVec<P<Expr>>),
@@ -1413,7 +1413,10 @@ pub enum ExprKind {
14131413
Lit(token::Lit),
14141414
/// A cast (e.g., `foo as f64`).
14151415
Cast(P<Expr>, P<Ty>),
1416-
/// A type ascription (e.g., `42: usize`).
1416+
/// A type ascription (e.g., `builtin # type_ascribe(42, usize)`).
1417+
///
1418+
/// Usually not written directly in user code but
1419+
/// indirectly via the macro `type_ascribe!(...)`.
14171420
Type(P<Expr>, P<Ty>),
14181421
/// A `let pat = expr` expression that is only semantically allowed in the condition
14191422
/// of `if` / `while` expressions. (e.g., `if let 0 = x { .. }`).
@@ -1488,7 +1491,10 @@ pub enum ExprKind {
14881491
/// Output of the `asm!()` macro.
14891492
InlineAsm(P<InlineAsm>),
14901493

1491-
/// Output of the `offset_of!()` macro.
1494+
/// An `offset_of` expression (e.g., `builtin # offset_of(Struct, field)`).
1495+
///
1496+
/// Usually not written directly in user code but
1497+
/// indirectly via the macro `core::mem::offset_of!(...)`.
14921498
OffsetOf(P<Ty>, P<[Ident]>),
14931499

14941500
/// A macro invocation; pre-expansion.

‎compiler/rustc_ast/src/entry.rs

+25-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,35 @@ use rustc_span::Symbol;
44

55
#[derive(Debug)]
66
pub enum EntryPointType {
7+
/// This function is not an entrypoint.
78
None,
9+
/// This is a function called `main` at the root level.
10+
/// ```
11+
/// fn main() {}
12+
/// ```
813
MainNamed,
14+
/// This is a function with the `#[rustc_main]` attribute.
15+
/// Used by the testing harness to create the test entrypoint.
16+
/// ```ignore (clashes with test entrypoint)
17+
/// #[rustc_main]
18+
/// fn main() {}
19+
/// ```
920
RustcMainAttr,
21+
/// This is a function with the `#[start]` attribute.
22+
/// ```ignore (clashes with test entrypoint)
23+
/// #[start]
24+
/// fn main() {}
25+
/// ```
1026
Start,
11-
OtherMain, // Not an entry point, but some other function named main
27+
/// This function is **not** an entrypoint but simply named `main` (not at the root).
28+
/// This is only used for diagnostics.
29+
/// ```
30+
/// #[allow(dead_code)]
31+
/// mod meow {
32+
/// fn main() {}
33+
/// }
34+
/// ```
35+
OtherMain,
1236
}
1337

1438
pub fn entry_point_type(

‎compiler/rustc_ast_lowering/src/index.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pub(super) fn index_hir<'hir>(
6262
if let Node::Err(span) = node.node {
6363
let hir_id = HirId { owner: item.def_id(), local_id };
6464
let msg = format!("ID {hir_id} not encountered when visiting item HIR");
65-
tcx.dcx().span_delayed_bug(*span, msg);
65+
tcx.dcx().span_delayed_bug(span, msg);
6666
}
6767
}
6868

@@ -376,7 +376,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
376376
}
377377
}
378378

379-
fn visit_array_length(&mut self, len: &'hir ArrayLen) {
379+
fn visit_array_length(&mut self, len: &'hir ArrayLen<'hir>) {
380380
match len {
381381
ArrayLen::Infer(inf) => self.insert(inf.span, inf.hir_id, Node::ArrayLenInfer(inf)),
382382
ArrayLen::Body(..) => intravisit::walk_array_len(self, len),

0 commit comments

Comments
 (0)