Skip to content

Commit 2019676

Browse files
calebcartwrightcalebcartwright
authored
Merge pull request #5980 from ytmimi/subtree_push_2023_12_12
Subtree push 2023-12-12
2 parents 2174e60 + 03510f3 commit 2019676

29 files changed

+75
-61
lines changed

‎Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ diff = "0.1"
4343
dirs = "4.0"
4444
getopts = "0.2"
4545
ignore = "0.4"
46-
itertools = "0.10"
46+
itertools = "0.11"
4747
lazy_static = "1.4"
4848
regex = "1.7"
4949
serde = { version = "1.0.160", features = ["derive"] }

‎rust-toolchain

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

‎src/closures.rs

+24-10
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub(crate) fn rewrite_closure(
2929
binder: &ast::ClosureBinder,
3030
constness: ast::Const,
3131
capture: ast::CaptureBy,
32-
is_async: &ast::Async,
32+
coroutine_kind: &Option<ast::CoroutineKind>,
3333
movability: ast::Movability,
3434
fn_decl: &ast::FnDecl,
3535
body: &ast::Expr,
@@ -40,7 +40,16 @@ pub(crate) fn rewrite_closure(
4040
debug!("rewrite_closure {:?}", body);
4141

4242
let (prefix, extra_offset) = rewrite_closure_fn_decl(
43-
binder, constness, capture, is_async, movability, fn_decl, body, span, context, shape,
43+
binder,
44+
constness,
45+
capture,
46+
coroutine_kind,
47+
movability,
48+
fn_decl,
49+
body,
50+
span,
51+
context,
52+
shape,
4453
)?;
4554
// 1 = space between `|...|` and body.
4655
let body_shape = shape.offset_left(extra_offset)?;
@@ -188,7 +197,7 @@ fn rewrite_closure_expr(
188197
fn allow_multi_line(expr: &ast::Expr) -> bool {
189198
match expr.kind {
190199
ast::ExprKind::Match(..)
191-
| ast::ExprKind::Async(..)
200+
| ast::ExprKind::Gen(..)
192201
| ast::ExprKind::Block(..)
193202
| ast::ExprKind::TryBlock(..)
194203
| ast::ExprKind::Loop(..)
@@ -233,7 +242,7 @@ fn rewrite_closure_fn_decl(
233242
binder: &ast::ClosureBinder,
234243
constness: ast::Const,
235244
capture: ast::CaptureBy,
236-
asyncness: &ast::Async,
245+
coroutine_kind: &Option<ast::CoroutineKind>,
237246
movability: ast::Movability,
238247
fn_decl: &ast::FnDecl,
239248
body: &ast::Expr,
@@ -263,16 +272,21 @@ fn rewrite_closure_fn_decl(
263272
} else {
264273
""
265274
};
266-
let is_async = if asyncness.is_async() { "async " } else { "" };
267-
let mover = if capture == ast::CaptureBy::Value {
275+
let coro = match coroutine_kind {
276+
Some(ast::CoroutineKind::Async { .. }) => "async ",
277+
Some(ast::CoroutineKind::Gen { .. }) => "gen ",
278+
Some(ast::CoroutineKind::AsyncGen { .. }) => "async gen ",
279+
None => "",
280+
};
281+
let mover = if matches!(capture, ast::CaptureBy::Value { .. }) {
268282
"move "
269283
} else {
270284
""
271285
};
272286
// 4 = "|| {".len(), which is overconservative when the closure consists of
273287
// a single expression.
274288
let nested_shape = shape
275-
.shrink_left(binder.len() + const_.len() + immovable.len() + is_async.len() + mover.len())?
289+
.shrink_left(binder.len() + const_.len() + immovable.len() + coro.len() + mover.len())?
276290
.sub_width(4)?;
277291

278292
// 1 = |
@@ -310,7 +324,7 @@ fn rewrite_closure_fn_decl(
310324
.tactic(tactic)
311325
.preserve_newline(true);
312326
let list_str = write_list(&item_vec, &fmt)?;
313-
let mut prefix = format!("{binder}{const_}{immovable}{is_async}{mover}|{list_str}|");
327+
let mut prefix = format!("{binder}{const_}{immovable}{coro}{mover}|{list_str}|");
314328

315329
if !ret_str.is_empty() {
316330
if prefix.contains('\n') {
@@ -339,7 +353,7 @@ pub(crate) fn rewrite_last_closure(
339353
ref binder,
340354
constness,
341355
capture_clause,
342-
ref asyncness,
356+
ref coroutine_kind,
343357
movability,
344358
ref fn_decl,
345359
ref body,
@@ -360,7 +374,7 @@ pub(crate) fn rewrite_last_closure(
360374
binder,
361375
constness,
362376
capture_clause,
363-
asyncness,
377+
coroutine_kind,
364378
movability,
365379
fn_decl,
366380
body,

‎src/comment.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Formatting and tools for comments.
22

3-
use std::{self, borrow::Cow, iter};
3+
use std::{borrow::Cow, iter};
44

55
use itertools::{multipeek, MultiPeek};
66
use lazy_static::lazy_static;
@@ -1847,7 +1847,6 @@ fn remove_comment_header(comment: &str) -> &str {
18471847
#[cfg(test)]
18481848
mod test {
18491849
use super::*;
1850-
use crate::shape::{Indent, Shape};
18511850

18521851
#[test]
18531852
fn char_classes() {

‎src/config/file_lines.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::path::PathBuf;
66
use std::{cmp, fmt, iter, str};
77

88
use rustc_data_structures::sync::Lrc;
9-
use rustc_span::{self, SourceFile};
9+
use rustc_span::SourceFile;
1010
use serde::{ser, Deserialize, Deserializer, Serialize, Serializer};
1111
use serde_json as json;
1212
use thiserror::Error;

‎src/config/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use std::cell::Cell;
2-
use std::default::Default;
32
use std::fs::File;
43
use std::io::{Error, ErrorKind, Read};
54
use std::path::{Path, PathBuf};
@@ -1018,7 +1017,6 @@ make_backup = false
10181017
#[cfg(test)]
10191018
mod partially_unstable_option {
10201019
use super::mock::{Config, PartiallyUnstableOption};
1021-
use super::*;
10221020

10231021
/// From the command line, we can override with a stable variant.
10241022
#[test]

‎src/config/options.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(unused_imports)]
2+
13
use std::collections::{hash_set, HashSet};
24
use std::fmt;
35
use std::path::{Path, PathBuf};

‎src/emitter/checkstyle.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use self::xml::XmlEscaped;
22
use super::*;
33
use crate::rustfmt_diff::{make_diff, DiffLine, Mismatch};
4-
use std::io::{self, Write};
54

65
mod xml;
76

‎src/emitter/diff.rs

-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ impl Emitter for DiffEmitter {
5151
#[cfg(test)]
5252
mod tests {
5353
use super::*;
54-
use crate::config::Config;
55-
use crate::FileName;
5654
use std::path::PathBuf;
5755

5856
#[test]

‎src/emitter/json.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use super::*;
22
use crate::rustfmt_diff::{make_diff, DiffLine, Mismatch};
33
use serde::Serialize;
44
use serde_json::to_string as to_json_string;
5-
use std::io::{self, Write};
65

76
#[derive(Debug, Default)]
87
pub(crate) struct JsonEmitter {
@@ -106,7 +105,6 @@ impl JsonEmitter {
106105
#[cfg(test)]
107106
mod tests {
108107
use super::*;
109-
use crate::FileName;
110108
use std::path::PathBuf;
111109

112110
#[test]

‎src/emitter/modified_lines.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use super::*;
22
use crate::rustfmt_diff::{make_diff, ModifiedLines};
3-
use std::io::Write;
43

54
#[derive(Debug, Default)]
65
pub(crate) struct ModifiedLinesEmitter;

‎src/emitter/stdout.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use super::*;
22
use crate::config::Verbosity;
3-
use std::io::Write;
43

54
#[derive(Debug)]
65
pub(crate) struct StdoutEmitter {

‎src/expr.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ pub(crate) fn format_expr(
212212
&cl.binder,
213213
cl.constness,
214214
cl.capture_clause,
215-
&cl.asyncness,
215+
&cl.coroutine_kind,
216216
cl.movability,
217217
&cl.fn_decl,
218218
&cl.body,
@@ -367,15 +367,15 @@ pub(crate) fn format_expr(
367367
))
368368
}
369369
}
370-
ast::ExprKind::Async(capture_by, ref block) => {
371-
let mover = if capture_by == ast::CaptureBy::Value {
370+
ast::ExprKind::Gen(capture_by, ref block, ref kind) => {
371+
let mover = if matches!(capture_by, ast::CaptureBy::Value { .. }) {
372372
"move "
373373
} else {
374374
""
375375
};
376376
if let rw @ Some(_) = rewrite_single_line_block(
377377
context,
378-
format!("async {mover}").as_str(),
378+
format!("{kind} {mover}").as_str(),
379379
block,
380380
Some(&expr.attrs),
381381
None,
@@ -386,7 +386,7 @@ pub(crate) fn format_expr(
386386
// 6 = `async `
387387
let budget = shape.width.saturating_sub(6);
388388
Some(format!(
389-
"async {mover}{}",
389+
"{kind} {mover}{}",
390390
rewrite_block(
391391
block,
392392
Some(&expr.attrs),
@@ -1371,7 +1371,7 @@ pub(crate) fn can_be_overflowed_expr(
13711371
}
13721372

13731373
// Handle always block-like expressions
1374-
ast::ExprKind::Async(..) | ast::ExprKind::Block(..) | ast::ExprKind::Closure(..) => true,
1374+
ast::ExprKind::Gen(..) | ast::ExprKind::Block(..) | ast::ExprKind::Closure(..) => true,
13751375

13761376
// Handle `[]` and `{}`-like expressions
13771377
ast::ExprKind::Array(..) | ast::ExprKind::Struct(..) => {
@@ -1933,7 +1933,7 @@ fn rewrite_unary_op(
19331933
shape: Shape,
19341934
) -> Option<String> {
19351935
// For some reason, an UnOp is not spanned like BinOp!
1936-
rewrite_unary_prefix(context, ast::UnOp::to_string(op), expr, shape)
1936+
rewrite_unary_prefix(context, op.as_str(), expr, shape)
19371937
}
19381938

19391939
pub(crate) enum RhsAssignKind<'ast> {

‎src/ignore_path.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use ignore::{self, gitignore};
1+
use ignore::gitignore;
22

33
use crate::config::{FileName, IgnoreList};
44

‎src/imports.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,6 @@ enum SharedPrefix {
11021102
#[cfg(test)]
11031103
mod test {
11041104
use super::*;
1105-
use rustc_span::DUMMY_SP;
11061105

11071106
// Parse the path part of an import. This parser is not robust and is only
11081107
// suitable for use in a test harness.

‎src/items.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ pub(crate) struct FnSig<'a> {
287287
decl: &'a ast::FnDecl,
288288
generics: &'a ast::Generics,
289289
ext: ast::Extern,
290-
is_async: Cow<'a, ast::Async>,
290+
coroutine_kind: Cow<'a, Option<ast::CoroutineKind>>,
291291
constness: ast::Const,
292292
defaultness: ast::Defaultness,
293293
unsafety: ast::Unsafe,
@@ -302,7 +302,7 @@ impl<'a> FnSig<'a> {
302302
) -> FnSig<'a> {
303303
FnSig {
304304
unsafety: method_sig.header.unsafety,
305-
is_async: Cow::Borrowed(&method_sig.header.asyncness),
305+
coroutine_kind: Cow::Borrowed(&method_sig.header.coroutine_kind),
306306
constness: method_sig.header.constness,
307307
defaultness: ast::Defaultness::Final,
308308
ext: method_sig.header.ext,
@@ -328,7 +328,7 @@ impl<'a> FnSig<'a> {
328328
generics,
329329
ext: fn_sig.header.ext,
330330
constness: fn_sig.header.constness,
331-
is_async: Cow::Borrowed(&fn_sig.header.asyncness),
331+
coroutine_kind: Cow::Borrowed(&fn_sig.header.coroutine_kind),
332332
defaultness,
333333
unsafety: fn_sig.header.unsafety,
334334
visibility: vis,
@@ -343,7 +343,8 @@ impl<'a> FnSig<'a> {
343343
result.push_str(&*format_visibility(context, self.visibility));
344344
result.push_str(format_defaultness(self.defaultness));
345345
result.push_str(format_constness(self.constness));
346-
result.push_str(format_async(&self.is_async));
346+
self.coroutine_kind
347+
.map(|coroutine_kind| result.push_str(format_coro(&coroutine_kind)));
347348
result.push_str(format_unsafety(self.unsafety));
348349
result.push_str(&format_extern(
349350
self.ext,

‎src/macros.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ struct MacroArgParser {
708708
fn last_tok(tt: &TokenTree) -> Token {
709709
match *tt {
710710
TokenTree::Token(ref t, _) => t.clone(),
711-
TokenTree::Delimited(delim_span, delim, _) => Token {
711+
TokenTree::Delimited(delim_span, _, delim, _) => Token {
712712
kind: TokenKind::CloseDelim(delim),
713713
span: delim_span.close,
714714
},
@@ -925,7 +925,7 @@ impl MacroArgParser {
925925
self.add_meta_variable(&mut iter)?;
926926
}
927927
TokenTree::Token(ref t, _) => self.update_buffer(t),
928-
&TokenTree::Delimited(_delimited_span, delimited, ref tts) => {
928+
&TokenTree::Delimited(_dspan, _spacing, delimited, ref tts) => {
929929
if !self.buf.is_empty() {
930930
if next_space(&self.last_tok.kind) == SpaceState::Always {
931931
self.add_separator();
@@ -1167,7 +1167,7 @@ impl<'a> MacroParser<'a> {
11671167
let tok = self.toks.next()?;
11681168
let (lo, args_paren_kind) = match tok {
11691169
TokenTree::Token(..) => return None,
1170-
&TokenTree::Delimited(delimited_span, d, _) => (delimited_span.open.lo(), d),
1170+
&TokenTree::Delimited(delimited_span, _, d, _) => (delimited_span.open.lo(), d),
11711171
};
11721172
let args = TokenStream::new(vec![tok.clone()]);
11731173
match self.toks.next()? {

‎src/matches.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ fn rewrite_match_arm(
223223
) -> Option<String> {
224224
let (missing_span, attrs_str) = if !arm.attrs.is_empty() {
225225
if contains_skip(&arm.attrs) {
226-
let (_, body) = flatten_arm_body(context, &arm.body, None);
226+
let (_, body) = flatten_arm_body(context, arm.body.as_deref()?, None);
227227
// `arm.span()` does not include trailing comma, add it manually.
228228
return Some(format!(
229229
"{}{}",
@@ -246,7 +246,7 @@ fn rewrite_match_arm(
246246
};
247247

248248
// Patterns
249-
let pat_shape = match &arm.body.kind {
249+
let pat_shape = match &arm.body.as_ref()?.kind {
250250
ast::ExprKind::Block(_, Some(label)) => {
251251
// Some block with a label ` => 'label: {`
252252
// 7 = ` => : {`
@@ -280,10 +280,10 @@ fn rewrite_match_arm(
280280
false,
281281
)?;
282282

283-
let arrow_span = mk_sp(arm.pat.span.hi(), arm.body.span().lo());
283+
let arrow_span = mk_sp(arm.pat.span.hi(), arm.body.as_ref()?.span().lo());
284284
rewrite_match_body(
285285
context,
286-
&arm.body,
286+
arm.body.as_ref()?,
287287
&lhs_str,
288288
shape,
289289
guard_str.contains('\n'),

‎src/pairs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ impl FlattenPair for ast::Expr {
339339
if let Some(pop) = stack.pop() {
340340
match pop.kind {
341341
ast::ExprKind::Binary(op, _, ref rhs) => {
342-
separators.push(op.node.to_string());
342+
separators.push(op.node.as_str());
343343
node = rhs;
344344
}
345345
_ => unreachable!(),

0 commit comments

Comments
 (0)