Skip to content

Commit 85e21fa

Browse files
calebcartwrightcalebcartwright
authored
Merge pull request #5994 from ytmimi/subtree_sync_with_1.77.0_nightly_2023_12_28
Subtree push with 1.77.0 nightly 2023-12-28
2 parents d86fc1b + 621904f commit 85e21fa

13 files changed

+68
-63
lines changed

‎rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2023-12-12"
2+
channel = "nightly-2023-12-28"
33
components = ["llvm-tools", "rustc-dev"]

‎src/closures.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ fn is_block_closure_forced(context: &RewriteContext<'_>, expr: &ast::Expr) -> bo
448448

449449
fn is_block_closure_forced_inner(expr: &ast::Expr, version: Version) -> bool {
450450
match expr.kind {
451-
ast::ExprKind::If(..) | ast::ExprKind::While(..) | ast::ExprKind::ForLoop(..) => true,
451+
ast::ExprKind::If(..) | ast::ExprKind::While(..) | ast::ExprKind::ForLoop { .. } => true,
452452
ast::ExprKind::Loop(..) if version == Version::Two => true,
453453
ast::ExprKind::AddrOf(_, _, ref expr)
454454
| ast::ExprKind::Try(ref expr)
@@ -473,7 +473,7 @@ fn expr_requires_semi_to_be_stmt(e: &ast::Expr) -> bool {
473473
| ast::ExprKind::Block(..)
474474
| ast::ExprKind::While(..)
475475
| ast::ExprKind::Loop(..)
476-
| ast::ExprKind::ForLoop(..)
476+
| ast::ExprKind::ForLoop { .. }
477477
| ast::ExprKind::TryBlock(..) => false,
478478
_ => true,
479479
}

‎src/expr.rs

+17-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::cmp::min;
33

44
use itertools::Itertools;
55
use rustc_ast::token::{Delimiter, Lit, LitKind};
6-
use rustc_ast::{ast, ptr, token};
6+
use rustc_ast::{ast, ptr, token, ForLoopKind};
77
use rustc_span::{BytePos, Span};
88

99
use crate::chains::rewrite_chain;
@@ -134,7 +134,7 @@ pub(crate) fn format_expr(
134134
}
135135
ast::ExprKind::Let(ref pat, ref expr, _span, _) => rewrite_let(context, shape, pat, expr),
136136
ast::ExprKind::If(..)
137-
| ast::ExprKind::ForLoop(..)
137+
| ast::ExprKind::ForLoop { .. }
138138
| ast::ExprKind::Loop(..)
139139
| ast::ExprKind::While(..) => to_control_flow(expr, expr_type)
140140
.and_then(|control_flow| control_flow.rewrite(context, shape)),
@@ -682,9 +682,15 @@ fn to_control_flow(expr: &ast::Expr, expr_type: ExprType) -> Option<ControlFlow<
682682
expr.span,
683683
))
684684
}
685-
ast::ExprKind::ForLoop(ref pat, ref cond, ref block, label) => {
686-
Some(ControlFlow::new_for(pat, cond, block, label, expr.span))
687-
}
685+
ast::ExprKind::ForLoop {
686+
ref pat,
687+
ref iter,
688+
ref body,
689+
label,
690+
kind,
691+
} => Some(ControlFlow::new_for(
692+
pat, iter, body, label, expr.span, kind,
693+
)),
688694
ast::ExprKind::Loop(ref block, label, _) => {
689695
Some(ControlFlow::new_loop(block, label, expr.span))
690696
}
@@ -771,14 +777,18 @@ impl<'a> ControlFlow<'a> {
771777
block: &'a ast::Block,
772778
label: Option<ast::Label>,
773779
span: Span,
780+
kind: ForLoopKind,
774781
) -> ControlFlow<'a> {
775782
ControlFlow {
776783
cond: Some(cond),
777784
block,
778785
else_block: None,
779786
label,
780787
pat: Some(pat),
781-
keyword: "for",
788+
keyword: match kind {
789+
ForLoopKind::For => "for",
790+
ForLoopKind::ForAwait => "for await",
791+
},
782792
matcher: "",
783793
connector: " in",
784794
allow_single_line: false,
@@ -1364,7 +1374,7 @@ pub(crate) fn can_be_overflowed_expr(
13641374
|| context.config.overflow_delimited_expr()
13651375
}
13661376
ast::ExprKind::If(..)
1367-
| ast::ExprKind::ForLoop(..)
1377+
| ast::ExprKind::ForLoop { .. }
13681378
| ast::ExprKind::Loop(..)
13691379
| ast::ExprKind::While(..) => {
13701380
context.config.combine_control_expr() && context.use_block_indent() && args_len == 1

‎src/items.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ impl<'a> FmtVisitor<'a> {
666666
let span = mk_sp(lo, field.span.lo());
667667

668668
let variant_body = match field.data {
669-
ast::VariantData::Tuple(..) | ast::VariantData::Struct(..) => format_struct(
669+
ast::VariantData::Tuple(..) | ast::VariantData::Struct { .. } => format_struct(
670670
&context,
671671
&StructParts::from_variant(field, &context),
672672
self.block_indent,
@@ -1094,7 +1094,7 @@ fn enum_variant_span(variant: &ast::Variant, context: &RewriteContext<'_>) -> Sp
10941094
if let Some(ref anon_const) = variant.disr_expr {
10951095
let span_before_consts = variant.span.until(anon_const.value.span);
10961096
let hi = match &variant.data {
1097-
Struct(..) => context
1097+
Struct { .. } => context
10981098
.snippet_provider
10991099
.span_after_last(span_before_consts, "}"),
11001100
Tuple(..) => context
@@ -1114,12 +1114,12 @@ fn format_struct(
11141114
offset: Indent,
11151115
one_line_width: Option<usize>,
11161116
) -> Option<String> {
1117-
match *struct_parts.def {
1117+
match struct_parts.def {
11181118
ast::VariantData::Unit(..) => format_unit_struct(context, struct_parts, offset),
1119-
ast::VariantData::Tuple(ref fields, _) => {
1119+
ast::VariantData::Tuple(fields, _) => {
11201120
format_tuple_struct(context, struct_parts, fields, offset)
11211121
}
1122-
ast::VariantData::Struct(ref fields, _) => {
1122+
ast::VariantData::Struct { fields, .. } => {
11231123
format_struct_struct(context, struct_parts, fields, offset, one_line_width)
11241124
}
11251125
}

‎src/matches.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ fn can_flatten_block_around_this(body: &ast::Expr) -> bool {
591591
ast::ExprKind::If(..) => false,
592592
// We do not allow collapsing a block around expression with condition
593593
// to avoid it being cluttered with match arm.
594-
ast::ExprKind::ForLoop(..) | ast::ExprKind::While(..) => false,
594+
ast::ExprKind::ForLoop { .. } | ast::ExprKind::While(..) => false,
595595
ast::ExprKind::Loop(..)
596596
| ast::ExprKind::Match(..)
597597
| ast::ExprKind::Block(..)

‎src/overflow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ impl<'a> Context<'a> {
421421
// When overflowing the expressions which consists of a control flow
422422
// expression, avoid condition to use multi line.
423423
ast::ExprKind::If(..)
424-
| ast::ExprKind::ForLoop(..)
424+
| ast::ExprKind::ForLoop { .. }
425425
| ast::ExprKind::Loop(..)
426426
| ast::ExprKind::While(..)
427427
| ast::ExprKind::Match(..) => {

‎src/parse/macros/cfg_if.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fn parse_cfg_if_inner<'a>(
6767
Ok(None) => continue,
6868
Err(err) => {
6969
err.cancel();
70-
parser.sess.span_diagnostic.reset_err_count();
70+
parser.sess.dcx.reset_err_count();
7171
return Err(
7272
"Expected item inside cfg_if block, but failed to parse it as an item",
7373
);

‎src/parse/macros/lazy_static.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ pub(crate) fn parse_lazy_static(
1616
($method:ident $(,)* $($arg:expr),* $(,)*) => {
1717
match parser.$method($($arg,)*) {
1818
Ok(val) => {
19-
if parser.sess.span_diagnostic.has_errors().is_some() {
20-
parser.sess.span_diagnostic.reset_err_count();
19+
if parser.sess.dcx.has_errors().is_some() {
20+
parser.sess.dcx.reset_err_count();
2121
return None;
2222
} else {
2323
val
2424
}
2525
}
2626
Err(err) => {
2727
err.cancel();
28-
parser.sess.span_diagnostic.reset_err_count();
28+
parser.sess.dcx.reset_err_count();
2929
return None;
3030
}
3131
}

‎src/parse/macros/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {
2828
let mut cloned_parser = (*parser).clone();
2929
match $parser(&mut cloned_parser) {
3030
Ok(x) => {
31-
if parser.sess.span_diagnostic.has_errors().is_some() {
32-
parser.sess.span_diagnostic.reset_err_count();
31+
if parser.sess.dcx.has_errors().is_some() {
32+
parser.sess.dcx.reset_err_count();
3333
} else {
3434
// Parsing succeeded.
3535
*parser = cloned_parser;
@@ -38,7 +38,7 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {
3838
}
3939
Err(e) => {
4040
e.cancel();
41-
parser.sess.span_diagnostic.reset_err_count();
41+
parser.sess.dcx.reset_err_count();
4242
}
4343
}
4444
};

‎src/parse/session.rs

+12-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
44
use rustc_data_structures::sync::{IntoDynSyncSend, Lrc};
55
use rustc_errors::emitter::{DynEmitter, Emitter, EmitterWriter};
66
use rustc_errors::translation::Translate;
7-
use rustc_errors::{ColorConfig, Diagnostic, Handler, Level as DiagnosticLevel};
7+
use rustc_errors::{ColorConfig, DiagCtxt, Diagnostic, Level as DiagnosticLevel};
88
use rustc_session::parse::ParseSess as RawParseSess;
99
use rustc_span::{
1010
source_map::{FilePathMapping, SourceMap},
@@ -118,13 +118,13 @@ impl From<Color> for ColorConfig {
118118
}
119119
}
120120

121-
fn default_handler(
121+
fn default_dcx(
122122
source_map: Lrc<SourceMap>,
123123
ignore_path_set: Lrc<IgnorePathSet>,
124124
can_reset: Lrc<AtomicBool>,
125125
show_parse_errors: bool,
126126
color: Color,
127-
) -> Handler {
127+
) -> DiagCtxt {
128128
let supports_color = term::stderr().map_or(false, |term| term.supports_color());
129129
let emit_color = if supports_color {
130130
ColorConfig::from(color)
@@ -141,7 +141,7 @@ fn default_handler(
141141
);
142142
Box::new(EmitterWriter::stderr(emit_color, fallback_bundle).sm(Some(source_map.clone())))
143143
};
144-
Handler::with_emitter(Box::new(SilentOnIgnoredFilesEmitter {
144+
DiagCtxt::with_emitter(Box::new(SilentOnIgnoredFilesEmitter {
145145
has_non_ignorable_parser_errors: false,
146146
source_map,
147147
emitter,
@@ -159,14 +159,14 @@ impl ParseSess {
159159
let source_map = Lrc::new(SourceMap::new(FilePathMapping::empty()));
160160
let can_reset_errors = Lrc::new(AtomicBool::new(false));
161161

162-
let handler = default_handler(
162+
let dcx = default_dcx(
163163
Lrc::clone(&source_map),
164164
Lrc::clone(&ignore_path_set),
165165
Lrc::clone(&can_reset_errors),
166166
config.show_parse_errors(),
167167
config.color(),
168168
);
169-
let parse_sess = RawParseSess::with_span_handler(handler, source_map);
169+
let parse_sess = RawParseSess::with_dcx(dcx, source_map);
170170

171171
Ok(ParseSess {
172172
parse_sess,
@@ -218,7 +218,7 @@ impl ParseSess {
218218
}
219219

220220
pub(crate) fn set_silent_emitter(&mut self) {
221-
self.parse_sess.span_diagnostic = Handler::with_emitter(silent_emitter());
221+
self.parse_sess.dcx = DiagCtxt::with_emitter(silent_emitter());
222222
}
223223

224224
pub(crate) fn span_to_filename(&self, span: Span) -> FileName {
@@ -284,10 +284,8 @@ impl ParseSess {
284284
// Methods that should be restricted within the parse module.
285285
impl ParseSess {
286286
pub(super) fn emit_diagnostics(&self, diagnostics: Vec<Diagnostic>) {
287-
for mut diagnostic in diagnostics {
288-
self.parse_sess
289-
.span_diagnostic
290-
.emit_diagnostic(&mut diagnostic);
287+
for diagnostic in diagnostics {
288+
self.parse_sess.dcx.emit_diagnostic(diagnostic);
291289
}
292290
}
293291

@@ -296,11 +294,11 @@ impl ParseSess {
296294
}
297295

298296
pub(super) fn has_errors(&self) -> bool {
299-
self.parse_sess.span_diagnostic.has_errors().is_some()
297+
self.parse_sess.dcx.has_errors().is_some()
300298
}
301299

302300
pub(super) fn reset_errors(&self) {
303-
self.parse_sess.span_diagnostic.reset_err_count();
301+
self.parse_sess.dcx.reset_err_count();
304302
}
305303
}
306304

@@ -372,7 +370,7 @@ mod tests {
372370

373371
fn build_diagnostic(level: DiagnosticLevel, span: Option<MultiSpan>) -> Diagnostic {
374372
let mut diag = Diagnostic::new(level, "");
375-
diag.message.clear();
373+
diag.messages.clear();
376374
if let Some(span) = span {
377375
diag.span = span;
378376
}

‎src/patterns.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,15 @@ impl Rewrite for Pat {
259259
None,
260260
None,
261261
),
262-
PatKind::Struct(ref qself, ref path, ref fields, ellipsis) => {
263-
rewrite_struct_pat(qself, path, fields, ellipsis, self.span, context, shape)
264-
}
262+
PatKind::Struct(ref qself, ref path, ref fields, rest) => rewrite_struct_pat(
263+
qself,
264+
path,
265+
fields,
266+
rest == ast::PatFieldsRest::Rest,
267+
self.span,
268+
context,
269+
shape,
270+
),
265271
PatKind::MacCall(ref mac) => {
266272
rewrite_macro(mac, None, context, shape, MacroPosition::Pat)
267273
}

‎src/types.rs

+11-20
Original file line numberDiff line numberDiff line change
@@ -537,28 +537,19 @@ impl Rewrite for ast::Lifetime {
537537
impl Rewrite for ast::GenericBound {
538538
fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
539539
match *self {
540-
ast::GenericBound::Trait(ref poly_trait_ref, trait_bound_modifier) => {
540+
ast::GenericBound::Trait(ref poly_trait_ref, modifiers) => {
541541
let snippet = context.snippet(self.span());
542542
let has_paren = snippet.starts_with('(') && snippet.ends_with(')');
543-
let rewrite = match trait_bound_modifier {
544-
ast::TraitBoundModifier::None => poly_trait_ref.rewrite(context, shape),
545-
ast::TraitBoundModifier::Maybe => poly_trait_ref
546-
.rewrite(context, shape.offset_left(1)?)
547-
.map(|s| format!("?{}", s)),
548-
ast::TraitBoundModifier::MaybeConst(_) => poly_trait_ref
549-
.rewrite(context, shape.offset_left(7)?)
550-
.map(|s| format!("~const {}", s)),
551-
ast::TraitBoundModifier::MaybeConstMaybe => poly_trait_ref
552-
.rewrite(context, shape.offset_left(8)?)
553-
.map(|s| format!("~const ?{}", s)),
554-
ast::TraitBoundModifier::Negative => poly_trait_ref
555-
.rewrite(context, shape.offset_left(1)?)
556-
.map(|s| format!("!{}", s)),
557-
ast::TraitBoundModifier::MaybeConstNegative => poly_trait_ref
558-
.rewrite(context, shape.offset_left(8)?)
559-
.map(|s| format!("~const !{}", s)),
560-
};
561-
rewrite.map(|s| if has_paren { format!("({})", s) } else { s })
543+
let mut constness = modifiers.constness.as_str().to_string();
544+
if !constness.is_empty() {
545+
constness.push(' ');
546+
}
547+
let polarity = modifiers.polarity.as_str();
548+
let shape = shape.offset_left(constness.len() + polarity.len())?;
549+
poly_trait_ref
550+
.rewrite(context, shape)
551+
.map(|s| format!("{constness}{polarity}{s}"))
552+
.map(|s| if has_paren { format!("({})", s) } else { s })
562553
}
563554
ast::GenericBound::Outlives(ref lifetime) => lifetime.rewrite(context, shape),
564555
}

‎src/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ pub(crate) fn semicolon_for_stmt(
295295
) -> bool {
296296
match stmt.kind {
297297
ast::StmtKind::Semi(ref expr) => match expr.kind {
298-
ast::ExprKind::While(..) | ast::ExprKind::Loop(..) | ast::ExprKind::ForLoop(..) => {
298+
ast::ExprKind::While(..) | ast::ExprKind::Loop(..) | ast::ExprKind::ForLoop { .. } => {
299299
false
300300
}
301301
ast::ExprKind::Break(..) | ast::ExprKind::Continue(..) | ast::ExprKind::Ret(..) => {
@@ -476,7 +476,7 @@ pub(crate) fn is_block_expr(context: &RewriteContext<'_>, expr: &ast::Expr, repr
476476
| ast::ExprKind::ConstBlock(..)
477477
| ast::ExprKind::Gen(..)
478478
| ast::ExprKind::Loop(..)
479-
| ast::ExprKind::ForLoop(..)
479+
| ast::ExprKind::ForLoop { .. }
480480
| ast::ExprKind::TryBlock(..)
481481
| ast::ExprKind::Match(..) => repr.contains('\n'),
482482
ast::ExprKind::Paren(ref expr)

0 commit comments

Comments
 (0)