Skip to content

Commit 14701ef

Browse files
borsbors
committed
Auto merge of #3479 - rust-lang:rustup-2024-04-17, r=RalfJung
Automatic Rustup
2 parents 8ad72b2 + 2cb03ef commit 14701ef

File tree

429 files changed

+4477
-2620
lines changed

Some content is hidden

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

429 files changed

+4477
-2620
lines changed

‎Cargo.lock

+4-2
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ dependencies = [
210210

211211
[[package]]
212212
name = "ar_archive_writer"
213-
version = "0.1.5"
213+
version = "0.2.0"
214214
source = "registry+https://github.com/rust-lang/crates.io-index"
215-
checksum = "9792d37ca5173d7e7f4fe453739a0671d0557915a030a383d6b866476bbc3e71"
215+
checksum = "f0c269894b6fe5e9d7ada0cf69b5bf847ff35bc25fc271f08e1d080fce80339a"
216216
dependencies = [
217217
"object 0.32.2",
218218
]
@@ -3342,6 +3342,7 @@ name = "run_make_support"
33423342
version = "0.0.0"
33433343
dependencies = [
33443344
"object 0.34.0",
3345+
"regex",
33453346
"wasmparser",
33463347
]
33473348

@@ -4278,6 +4279,7 @@ dependencies = [
42784279
"rustc_fluent_macro",
42794280
"rustc_graphviz",
42804281
"rustc_hir",
4282+
"rustc_hir_pretty",
42814283
"rustc_index",
42824284
"rustc_macros",
42834285
"rustc_query_system",

‎compiler/rustc_ast/src/ast.rs

+18-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ use rustc_macros::HashStable_Generic;
3636
use rustc_span::source_map::{respan, Spanned};
3737
use rustc_span::symbol::{kw, sym, Ident, Symbol};
3838
use rustc_span::{ErrorGuaranteed, Span, DUMMY_SP};
39+
use std::cmp;
3940
use std::fmt;
4041
use std::mem;
4142
use thin_vec::{thin_vec, ThinVec};
@@ -63,7 +64,7 @@ impl fmt::Debug for Label {
6364

6465
/// A "Lifetime" is an annotation of the scope in which variable
6566
/// can be used, e.g. `'a` in `&'a i32`.
66-
#[derive(Clone, Encodable, Decodable, Copy, PartialEq, Eq)]
67+
#[derive(Clone, Encodable, Decodable, Copy, PartialEq, Eq, Hash)]
6768
pub struct Lifetime {
6869
pub id: NodeId,
6970
pub ident: Ident,
@@ -731,6 +732,13 @@ impl BindingAnnotation {
731732
Self::MUT_REF_MUT => "mut ref mut ",
732733
}
733734
}
735+
736+
pub fn cap_ref_mutability(mut self, mutbl: Mutability) -> Self {
737+
if let ByRef::Yes(old_mutbl) = &mut self.0 {
738+
*old_mutbl = cmp::min(*old_mutbl, mutbl);
739+
}
740+
self
741+
}
734742
}
735743

736744
#[derive(Clone, Encodable, Decodable, Debug)]
@@ -2132,7 +2140,7 @@ pub enum TyKind {
21322140
/// The `NodeId` exists to prevent lowering from having to
21332141
/// generate `NodeId`s on the fly, which would complicate
21342142
/// the generation of opaque `type Foo = impl Trait` items significantly.
2135-
ImplTrait(NodeId, GenericBounds),
2143+
ImplTrait(NodeId, GenericBounds, Option<P<(ThinVec<PreciseCapturingArg>, Span)>>),
21362144
/// No-op; kept solely so that we can pretty-print faithfully.
21372145
Paren(P<Ty>),
21382146
/// Unused for now.
@@ -2188,6 +2196,14 @@ pub enum TraitObjectSyntax {
21882196
None,
21892197
}
21902198

2199+
#[derive(Clone, Encodable, Decodable, Debug)]
2200+
pub enum PreciseCapturingArg {
2201+
/// Lifetime parameter
2202+
Lifetime(Lifetime),
2203+
/// Type or const parameter
2204+
Arg(Path, NodeId),
2205+
}
2206+
21912207
/// Inline assembly operand explicit register or register class.
21922208
///
21932209
/// E.g., `"eax"` as in `asm!("mov eax, 2", out("eax") result)`.

‎compiler/rustc_ast/src/attr/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,11 @@ impl MetaItem {
308308
// FIXME: Share code with `parse_path`.
309309
let path = match tokens.next().map(|tt| TokenTree::uninterpolate(tt)).as_deref() {
310310
Some(&TokenTree::Token(
311-
Token { kind: ref kind @ (token::Ident(..) | token::ModSep), span },
311+
Token { kind: ref kind @ (token::Ident(..) | token::PathSep), span },
312312
_,
313313
)) => 'arm: {
314314
let mut segments = if let &token::Ident(name, _) = kind {
315-
if let Some(TokenTree::Token(Token { kind: token::ModSep, .. }, _)) =
315+
if let Some(TokenTree::Token(Token { kind: token::PathSep, .. }, _)) =
316316
tokens.peek()
317317
{
318318
tokens.next();
@@ -331,7 +331,7 @@ impl MetaItem {
331331
} else {
332332
return None;
333333
}
334-
if let Some(TokenTree::Token(Token { kind: token::ModSep, .. }, _)) =
334+
if let Some(TokenTree::Token(Token { kind: token::PathSep, .. }, _)) =
335335
tokens.peek()
336336
{
337337
tokens.next();

‎compiler/rustc_ast/src/mut_visit.rs

+22-1
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ pub trait MutVisitor: Sized {
259259
noop_visit_param_bound(tpb, self);
260260
}
261261

262+
fn visit_precise_capturing_arg(&mut self, arg: &mut PreciseCapturingArg) {
263+
noop_visit_precise_capturing_arg(arg, self);
264+
}
265+
262266
fn visit_mt(&mut self, mt: &mut MutTy) {
263267
noop_visit_mt(mt, self);
264268
}
@@ -518,9 +522,14 @@ pub fn noop_visit_ty<T: MutVisitor>(ty: &mut P<Ty>, vis: &mut T) {
518522
TyKind::TraitObject(bounds, _syntax) => {
519523
visit_vec(bounds, |bound| vis.visit_param_bound(bound))
520524
}
521-
TyKind::ImplTrait(id, bounds) => {
525+
TyKind::ImplTrait(id, bounds, precise_capturing) => {
522526
vis.visit_id(id);
523527
visit_vec(bounds, |bound| vis.visit_param_bound(bound));
528+
if let Some((precise_capturing, _span)) = precise_capturing.as_deref_mut() {
529+
for arg in precise_capturing {
530+
vis.visit_precise_capturing_arg(arg);
531+
}
532+
}
524533
}
525534
TyKind::MacCall(mac) => vis.visit_mac_call(mac),
526535
TyKind::AnonStruct(id, fields) | TyKind::AnonUnion(id, fields) => {
@@ -914,6 +923,18 @@ pub fn noop_visit_param_bound<T: MutVisitor>(pb: &mut GenericBound, vis: &mut T)
914923
}
915924
}
916925

926+
pub fn noop_visit_precise_capturing_arg<T: MutVisitor>(arg: &mut PreciseCapturingArg, vis: &mut T) {
927+
match arg {
928+
PreciseCapturingArg::Lifetime(lt) => {
929+
vis.visit_lifetime(lt);
930+
}
931+
PreciseCapturingArg::Arg(path, id) => {
932+
vis.visit_path(path);
933+
vis.visit_id(id);
934+
}
935+
}
936+
}
937+
917938
pub fn noop_flat_map_generic_param<T: MutVisitor>(
918939
mut param: GenericParam,
919940
vis: &mut T,

‎compiler/rustc_ast/src/token.rs

+12-10
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub enum Delimiter {
5151
Brace,
5252
/// `[ ... ]`
5353
Bracket,
54-
/// `Ø ... Ø`
54+
/// `∅ ... ∅`
5555
/// An invisible delimiter, that may, for example, appear around tokens coming from a
5656
/// "macro variable" `$var`. It is important to preserve operator priorities in cases like
5757
/// `$var * 3` where `$var` is `1 + 2`.
@@ -290,7 +290,7 @@ pub enum TokenKind {
290290
/// `:`
291291
Colon,
292292
/// `::`
293-
ModSep,
293+
PathSep,
294294
/// `->`
295295
RArrow,
296296
/// `<-`
@@ -393,7 +393,7 @@ impl TokenKind {
393393
BinOpEq(Shr) => (Gt, Ge),
394394
DotDot => (Dot, Dot),
395395
DotDotDot => (Dot, DotDot),
396-
ModSep => (Colon, Colon),
396+
PathSep => (Colon, Colon),
397397
RArrow => (BinOp(Minus), Gt),
398398
LArrow => (Lt, BinOp(Minus)),
399399
FatArrow => (Eq, Gt),
@@ -454,7 +454,9 @@ impl Token {
454454
match self.kind {
455455
Eq | Lt | Le | EqEq | Ne | Ge | Gt | AndAnd | OrOr | Not | Tilde | BinOp(_)
456456
| BinOpEq(_) | At | Dot | DotDot | DotDotDot | DotDotEq | Comma | Semi | Colon
457-
| ModSep | RArrow | LArrow | FatArrow | Pound | Dollar | Question | SingleQuote => true,
457+
| PathSep | RArrow | LArrow | FatArrow | Pound | Dollar | Question | SingleQuote => {
458+
true
459+
}
458460

459461
OpenDelim(..) | CloseDelim(..) | Literal(..) | DocComment(..) | Ident(..)
460462
| Lifetime(..) | Interpolated(..) | Eof => false,
@@ -481,7 +483,7 @@ impl Token {
481483
// DotDotDot is no longer supported, but we need some way to display the error
482484
DotDot | DotDotDot | DotDotEq | // range notation
483485
Lt | BinOp(Shl) | // associated path
484-
ModSep | // global path
486+
PathSep | // global path
485487
Lifetime(..) | // labeled loop
486488
Pound => true, // expression attributes
487489
Interpolated(ref nt) => matches!(&nt.0, NtLiteral(..) |
@@ -507,7 +509,7 @@ impl Token {
507509
// DotDotDot is no longer supported
508510
| DotDot | DotDotDot | DotDotEq // ranges
509511
| Lt | BinOp(Shl) // associated path
510-
| ModSep => true, // global path
512+
| PathSep => true, // global path
511513
Interpolated(ref nt) => matches!(&nt.0, NtLiteral(..) |
512514
NtPat(..) |
513515
NtBlock(..) |
@@ -530,7 +532,7 @@ impl Token {
530532
Question | // maybe bound in trait object
531533
Lifetime(..) | // lifetime bound in trait object
532534
Lt | BinOp(Shl) | // associated path
533-
ModSep => true, // global path
535+
PathSep => true, // global path
534536
Interpolated(ref nt) => matches!(&nt.0, NtTy(..) | NtPath(..)),
535537
// For anonymous structs or unions, which only appear in specific positions
536538
// (type of struct fields or union fields), we don't consider them as regular types
@@ -708,7 +710,7 @@ impl Token {
708710
}
709711

710712
pub fn is_path_start(&self) -> bool {
711-
self == &ModSep
713+
self == &PathSep
712714
|| self.is_qpath_start()
713715
|| self.is_whole_path()
714716
|| self.is_path_segment_keyword()
@@ -821,7 +823,7 @@ impl Token {
821823
_ => return None,
822824
},
823825
Colon => match joint.kind {
824-
Colon => ModSep,
826+
Colon => PathSep,
825827
_ => return None,
826828
},
827829
SingleQuote => match joint.kind {
@@ -830,7 +832,7 @@ impl Token {
830832
},
831833

832834
Le | EqEq | Ne | Ge | AndAnd | OrOr | Tilde | BinOpEq(..) | At | DotDotDot
833-
| DotDotEq | Comma | Semi | ModSep | RArrow | LArrow | FatArrow | Pound | Dollar
835+
| DotDotEq | Comma | Semi | PathSep | RArrow | LArrow | FatArrow | Pound | Dollar
834836
| Question | OpenDelim(..) | CloseDelim(..) | Literal(..) | Ident(..)
835837
| Lifetime(..) | Interpolated(..) | DocComment(..) | Eof => return None,
836838
};

‎compiler/rustc_ast/src/visit.rs

+23-1
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ pub trait Visitor<'ast>: Sized {
184184
fn visit_param_bound(&mut self, bounds: &'ast GenericBound, _ctxt: BoundKind) -> Self::Result {
185185
walk_param_bound(self, bounds)
186186
}
187+
fn visit_precise_capturing_arg(&mut self, arg: &'ast PreciseCapturingArg) {
188+
walk_precise_capturing_arg(self, arg);
189+
}
187190
fn visit_poly_trait_ref(&mut self, t: &'ast PolyTraitRef) -> Self::Result {
188191
walk_poly_trait_ref(self, t)
189192
}
@@ -457,8 +460,13 @@ pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) -> V::Result {
457460
TyKind::TraitObject(bounds, ..) => {
458461
walk_list!(visitor, visit_param_bound, bounds, BoundKind::TraitObject);
459462
}
460-
TyKind::ImplTrait(_, bounds) => {
463+
TyKind::ImplTrait(_, bounds, precise_capturing) => {
461464
walk_list!(visitor, visit_param_bound, bounds, BoundKind::Impl);
465+
if let Some((precise_capturing, _span)) = precise_capturing.as_deref() {
466+
for arg in precise_capturing {
467+
try_visit!(visitor.visit_precise_capturing_arg(arg));
468+
}
469+
}
462470
}
463471
TyKind::Typeof(expression) => try_visit!(visitor.visit_anon_const(expression)),
464472
TyKind::Infer | TyKind::ImplicitSelf | TyKind::Dummy | TyKind::Err(_) => {}
@@ -637,6 +645,20 @@ pub fn walk_param_bound<'a, V: Visitor<'a>>(visitor: &mut V, bound: &'a GenericB
637645
}
638646
}
639647

648+
pub fn walk_precise_capturing_arg<'a, V: Visitor<'a>>(
649+
visitor: &mut V,
650+
arg: &'a PreciseCapturingArg,
651+
) {
652+
match arg {
653+
PreciseCapturingArg::Lifetime(lt) => {
654+
visitor.visit_lifetime(lt, LifetimeCtxt::GenericArg);
655+
}
656+
PreciseCapturingArg::Arg(path, id) => {
657+
visitor.visit_path(path, *id);
658+
}
659+
}
660+
}
661+
640662
pub fn walk_generic_param<'a, V: Visitor<'a>>(
641663
visitor: &mut V,
642664
param: &'a GenericParam,

‎compiler/rustc_ast_lowering/messages.ftl

+2
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ ast_lowering_never_pattern_with_guard =
127127
a guard on a never pattern will never be run
128128
.suggestion = remove this guard
129129
130+
ast_lowering_no_precise_captures_on_apit = `use<...>` precise capturing syntax not allowed on argument-position `impl Trait`
131+
130132
ast_lowering_previously_used_here = previously used here
131133
132134
ast_lowering_register1 = register `{$reg1_name}`

‎compiler/rustc_ast_lowering/src/errors.rs

+7
Original file line numberDiff line numberDiff line change
@@ -414,3 +414,10 @@ pub(crate) struct AsyncBoundOnlyForFnTraits {
414414
#[primary_span]
415415
pub span: Span,
416416
}
417+
418+
#[derive(Diagnostic)]
419+
#[diag(ast_lowering_no_precise_captures_on_apit)]
420+
pub(crate) struct NoPreciseCapturesOnApit {
421+
#[primary_span]
422+
pub span: Span,
423+
}

‎compiler/rustc_ast_lowering/src/expr.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use rustc_ast::*;
1414
use rustc_data_structures::stack::ensure_sufficient_stack;
1515
use rustc_hir as hir;
1616
use rustc_hir::def::{DefKind, Res};
17+
use rustc_hir::HirId;
1718
use rustc_middle::span_bug;
1819
use rustc_session::errors::report_lit_error;
1920
use rustc_span::source_map::{respan, Spanned};
@@ -701,8 +702,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
701702
pub(super) fn maybe_forward_track_caller(
702703
&mut self,
703704
span: Span,
704-
outer_hir_id: hir::HirId,
705-
inner_hir_id: hir::HirId,
705+
outer_hir_id: HirId,
706+
inner_hir_id: HirId,
706707
) {
707708
if self.tcx.features().async_fn_track_caller
708709
&& let Some(attrs) = self.attrs.get(&outer_hir_id.local_id)
@@ -1048,7 +1049,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
10481049
binder: &ClosureBinder,
10491050
capture_clause: CaptureBy,
10501051
closure_id: NodeId,
1051-
closure_hir_id: hir::HirId,
1052+
closure_hir_id: HirId,
10521053
coroutine_kind: CoroutineKind,
10531054
decl: &FnDecl,
10541055
body: &Expr,
@@ -2036,7 +2037,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
20362037
&mut self,
20372038
sp: Span,
20382039
ident: Ident,
2039-
binding: hir::HirId,
2040+
binding: HirId,
20402041
) -> &'hir hir::Expr<'hir> {
20412042
self.arena.alloc(self.expr_ident_mut(sp, ident, binding))
20422043
}
@@ -2045,7 +2046,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
20452046
&mut self,
20462047
span: Span,
20472048
ident: Ident,
2048-
binding: hir::HirId,
2049+
binding: HirId,
20492050
) -> hir::Expr<'hir> {
20502051
let hir_id = self.next_id();
20512052
let res = Res::Local(binding);

‎compiler/rustc_ast_lowering/src/index.rs

+17
Original file line numberDiff line numberDiff line change
@@ -385,4 +385,21 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
385385
fn visit_pattern_type_pattern(&mut self, p: &'hir hir::Pat<'hir>) {
386386
self.visit_pat(p)
387387
}
388+
389+
fn visit_precise_capturing_arg(
390+
&mut self,
391+
arg: &'hir PreciseCapturingArg<'hir>,
392+
) -> Self::Result {
393+
match arg {
394+
PreciseCapturingArg::Lifetime(_) => {
395+
// This is represented as a `Node::Lifetime`, intravisit will get to it below.
396+
}
397+
PreciseCapturingArg::Param(param) => self.insert(
398+
param.ident.span,
399+
param.hir_id,
400+
Node::PreciseCapturingNonLifetimeArg(param),
401+
),
402+
}
403+
intravisit::walk_precise_capturing_arg(self, arg);
404+
}
388405
}

0 commit comments

Comments
 (0)