Skip to content

Commit 3ffd7d4

Browse files
calebcartwrightcalebcartwright
authored
Merge pull request #6193 from ytmimi/subtree-push-nightly-2024-06-13
subtree-push nightly-2024-06-13
2 parents 55a7026 + 306ddab commit 3ffd7d4

Some content is hidden

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

52 files changed

+598
-419
lines changed

‎.github/workflows/integration.yml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
matrix:
2020
integration: [
2121
bitflags,
22-
error-chain,
2322
log,
2423
mdbook,
2524
packed_simd,

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
## [Unreleased]
44

55
- Updating `dirs 4.0.0 -> 5.0.1` and `cargo_metadata 0.15.4 -> 0.18.0` [#6033] (https://github.com/rust-lang/rustfmt/issues/6033)
6+
- Bumped bytecount `0.6.4` -> `0.6.8` to fix compilation issues with the `generic-simd` feature. See [bytecount#92] and [bytecount#93]
7+
8+
[bytecount#92]: https://github.com/llogiq/bytecount/pull/92
9+
[bytecount#93]: https://github.com/llogiq/bytecount/pull/93
10+
11+
- Output correct syntax for type ascription builtin [#6159](https://github.com/rust-lang/rustfmt/issues/6159)
12+
```rust
13+
fn main() {
14+
builtin # type_ascribe(10, usize)
15+
}
16+
```
617

718
## [1.7.0] 2023-10-22
819

‎Cargo.lock

+2-31
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
@@ -35,7 +35,7 @@ generic-simd = ["bytecount/generic-simd"]
3535
[dependencies]
3636
annotate-snippets = { version = "0.9", features = ["color"] }
3737
anyhow = "1.0"
38-
bytecount = "0.6.4"
38+
bytecount = "0.6.8"
3939
cargo_metadata = "0.18"
4040
clap = { version = "4.4.2", features = ["derive"] }
4141
clap-cargo = "0.12.0"

‎ci/integration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ case ${INTEGRATION} in
104104
check_fmt_with_all_tests
105105
cd -
106106
;;
107-
error-chain | tempdir)
107+
tempdir)
108108
git clone --depth=1 https://github.com/rust-lang-deprecated/${INTEGRATION}.git
109109
cd ${INTEGRATION}
110110
show_head

‎config_proc_macro/src/attrs.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ fn get_name_value_str_lit(attr: &syn::Attribute, name: &str) -> Option<String> {
6868
match &attr.meta {
6969
syn::Meta::NameValue(syn::MetaNameValue {
7070
path,
71-
value: syn::Expr::Lit(syn::ExprLit { lit: syn::Lit::Str(lit_str), .. }),
71+
value:
72+
syn::Expr::Lit(syn::ExprLit {
73+
lit: syn::Lit::Str(lit_str),
74+
..
75+
}),
7276
..
7377
}) if path.is_ident(name) => Some(lit_str.value()),
7478
_ => None,

‎rust-toolchain

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

‎src/attr.rs

+13-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub(crate) fn get_attrs_from_stmt(stmt: &ast::Stmt) -> &[ast::Attribute] {
2626

2727
pub(crate) fn get_span_without_attrs(stmt: &ast::Stmt) -> Span {
2828
match stmt.kind {
29-
ast::StmtKind::Local(ref local) => local.span,
29+
ast::StmtKind::Let(ref local) => local.span,
3030
ast::StmtKind::Item(ref item) => item.span,
3131
ast::StmtKind::Expr(ref expr) | ast::StmtKind::Semi(ref expr) => expr.span,
3232
ast::StmtKind::MacCall(ref mac_stmt) => mac_stmt.mac.span(),
@@ -353,10 +353,18 @@ impl Rewrite for ast::Attribute {
353353

354354
// 1 = `[`
355355
let shape = shape.offset_left(prefix.len() + 1)?;
356-
Some(
357-
meta.rewrite(context, shape)
358-
.map_or_else(|| snippet.to_owned(), |rw| format!("{}[{}]", prefix, rw)),
359-
)
356+
Some(meta.rewrite(context, shape).map_or_else(
357+
|| snippet.to_owned(),
358+
|rw| match &self.kind {
359+
ast::AttrKind::Normal(normal_attr) => match normal_attr.item.unsafety {
360+
// For #![feature(unsafe_attributes)]
361+
// See https://github.com/rust-lang/rust/issues/123757
362+
ast::Safety::Unsafe(_) => format!("{}[unsafe({})]", prefix, rw),
363+
_ => format!("{}[{}]", prefix, rw),
364+
},
365+
_ => format!("{}[{}]", prefix, rw),
366+
},
367+
))
360368
} else {
361369
Some(snippet.to_owned())
362370
}

‎src/comment.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1714,10 +1714,10 @@ pub(crate) fn recover_comment_removed(
17141714
// We missed some comments. Warn and keep the original text.
17151715
if context.config.error_on_unformatted() {
17161716
context.report.append(
1717-
context.parse_sess.span_to_filename(span),
1717+
context.psess.span_to_filename(span),
17181718
vec![FormattingError::from_span(
17191719
span,
1720-
context.parse_sess,
1720+
context.psess,
17211721
ErrorKind::LostComment,
17221722
)],
17231723
);

‎src/config/style_edition.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::config::StyleEdition;
22

33
/// Defines the default value for the given style edition
4+
#[allow(dead_code)]
45
pub(crate) trait StyleEditionDefault {
56
type ConfigType;
67
fn style_edition_default(style_edition: StyleEdition) -> Self::ConfigType;

‎src/expr.rs

+7-14
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, ForLoopKind};
6+
use rustc_ast::{ast, ptr, token, ForLoopKind, MatchKind};
77
use rustc_span::{BytePos, Span};
88

99
use crate::chains::rewrite_chain;
@@ -180,8 +180,8 @@ pub(crate) fn format_expr(
180180
}
181181
}
182182
}
183-
ast::ExprKind::Match(ref cond, ref arms) => {
184-
rewrite_match(context, cond, arms, shape, expr.span, &expr.attrs)
183+
ast::ExprKind::Match(ref cond, ref arms, kind) => {
184+
rewrite_match(context, cond, arms, shape, expr.span, &expr.attrs, kind)
185185
}
186186
ast::ExprKind::Path(ref qself, ref path) => {
187187
rewrite_path(context, PathContext::Expr, qself, path, shape)
@@ -263,14 +263,6 @@ pub(crate) fn format_expr(
263263
shape,
264264
SeparatorPlace::Front,
265265
),
266-
ast::ExprKind::Type(ref expr, ref ty) => rewrite_pair(
267-
&**expr,
268-
&**ty,
269-
PairParts::infix(": "),
270-
context,
271-
shape,
272-
SeparatorPlace::Back,
273-
),
274266
ast::ExprKind::Index(ref expr, ref index, _) => {
275267
rewrite_index(&**expr, &**index, context, shape)
276268
}
@@ -412,6 +404,7 @@ pub(crate) fn format_expr(
412404
}
413405
ast::ExprKind::Underscore => Some("_".to_owned()),
414406
ast::ExprKind::FormatArgs(..)
407+
| ast::ExprKind::Type(..)
415408
| ast::ExprKind::IncludedBytes(..)
416409
| ast::ExprKind::OffsetOf(..) => {
417410
// These don't normally occur in the AST because macros aren't expanded. However,
@@ -420,7 +413,7 @@ pub(crate) fn format_expr(
420413
// Also, rustfmt might get passed the output from `-Zunpretty=expanded`.
421414
None
422415
}
423-
ast::ExprKind::Err => None,
416+
ast::ExprKind::Err(_) | ast::ExprKind::Dummy => None,
424417
};
425418

426419
expr_rw
@@ -641,7 +634,7 @@ pub(crate) fn rewrite_cond(
641634
shape: Shape,
642635
) -> Option<String> {
643636
match expr.kind {
644-
ast::ExprKind::Match(ref cond, _) => {
637+
ast::ExprKind::Match(ref cond, _, MatchKind::Prefix) => {
645638
// `match `cond` {`
646639
let cond_shape = match context.config.indent_style() {
647640
IndentStyle::Visual => shape.shrink_left(6).and_then(|s| s.sub_width(2))?,
@@ -1963,7 +1956,7 @@ fn rewrite_unary_op(
19631956
}
19641957

19651958
pub(crate) enum RhsAssignKind<'ast> {
1966-
Expr(&'ast ast::ExprKind, Span),
1959+
Expr(&'ast ast::ExprKind, #[allow(dead_code)] Span),
19671960
Bounds,
19681961
Ty,
19691962
}

0 commit comments

Comments
 (0)