Skip to content

Commit 76cd550

Browse files
ytmimiytmimi
committed
Merge remote-tracking branch 'upstream/master' into subtree-push-nightly-2024-06-13
2 parents 783a411 + c97996f commit 76cd550

File tree

89 files changed

+1333
-221
lines changed

Some content is hidden

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

89 files changed

+1333
-221
lines changed

‎CHANGELOG.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## [Unreleased]
44

5+
- 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)
56

67
## [1.7.0] 2023-10-22
78

@@ -27,7 +28,7 @@
2728
}
2829
```
2930
- Prevent ICE when formatting `vec!{}` [#5735](https://github.com/rust-lang/rustfmt/issues/5735)
30-
- Prevent internal trailing whitespace error when formatting an empty `macro_rules!` defintion e.g. `macro_rules! foo {}` [#5882](https://github.com/rust-lang/rustfmt/issues/5882)
31+
- Prevent internal trailing whitespace error when formatting an empty `macro_rules!` definition e.g. `macro_rules! foo {}` [#5882](https://github.com/rust-lang/rustfmt/issues/5882)
3132
- Formatting doc comment lines that start with `.` or `)` won't be treated as ordered markdown lists because `.` or `)` must be preceded by a number to start an ordered markdown list [#5835](https://github.com/rust-lang/rustfmt/pull/5835)
3233
- Add parenthesis around closures when they're used as method receives, don't have a block body, and end with `.` [#4808](https://github.com/rust-lang/rustfmt/issues/4808)
3334
```rust
@@ -184,7 +185,7 @@
184185

185186
- Simplify the rustfmt help text by eliding the full path to the rustfmt binary path from the usage string when running `rustfmt --help` [#5214](https://github.com/rust-lang/rustfmt/issues/5214)
186187

187-
- Bumped the version for serveral dependencies. Most notably `dirs` `v2.0.1` -> `v4.0.0`. This changed the global user config directory on macOS from `$HOME/Library/Preferences` to `$HOME/Library/Application Support` [#5237](https://github.com/rust-lang/rustfmt/pull/5237)
188+
- Bumped the version for several dependencies. Most notably `dirs` `v2.0.1` -> `v4.0.0`. This changed the global user config directory on macOS from `$HOME/Library/Preferences` to `$HOME/Library/Application Support` [#5237](https://github.com/rust-lang/rustfmt/pull/5237)
188189

189190
### Fixed
190191

@@ -942,7 +943,7 @@ from formatting an attribute #3665
942943

943944
### Fixed
944945

945-
- Do not remove path disambiugator inside macro #3142
946+
- Do not remove path disambiguator inside macro #3142
946947
- Improve handling of Windows newlines #3141
947948
- Fix alignment of a struct's fields (`struct_field_align_threshold` option) with the Visual `indent_style` #3165
948949
- Fix a bug in formatting markdown lists within comments #3172
@@ -1031,7 +1032,7 @@ from formatting an attribute #3665
10311032

10321033
### Changed
10331034

1034-
- Replace '--conifig-help' with '--config=help' cb10e06
1035+
- Replace '--config-help' with '--config=help' cb10e06
10351036
- Improve formatting of slice patterns #2912
10361037

10371038
### Fixed
@@ -1075,7 +1076,7 @@ from formatting an attribute #3665
10751076
- Add max_width option for all heuristics c2ae39e
10761077
- Add config option `format_macro_matchers` to format the metavariable matching patterns in macros 79c5ee8
10771078
- Add config option `format_macro_bodies` to format the bodies of macros 79c5ee8
1078-
- Format exitential type fc307ff
1079+
- Format existential type fc307ff
10791080
- Support raw identifiers in struct expressions f121b1a
10801081
- Format Async block and async function 0b25f60
10811082

@@ -1131,7 +1132,7 @@ from formatting an attribute #3665
11311132

11321133
### Changed
11331134

1134-
- Update rustc-ap-syntax to 128.0.0 and ustc-ap-rustc_target to 128.0.0 195395f
1135+
- Update rustc-ap-syntax to 128.0.0 and rustc-ap-rustc_target to 128.0.0 195395f
11351136
- Put operands on its own line when each fits in a single line f8439ce
11361137
- Improve CLI options 55ac062 1869888 798bffb 4d9de48 eca7796 8396da1 5d9f5aa
11371138

@@ -1195,7 +1196,7 @@ from formatting an attribute #3665
11951196
- Do not collapse block around expr with condition on match arm 5b9b7d5
11961197
- Use vertical layout for complex attributes c77708f
11971198
- Format array using heuristics for function calls 98c6f7b
1198-
- Implement stable ordering for impl items with the the following item priority: type, const, macro, then method fa80ddf
1199+
- Implement stable ordering for impl items with the following item priority: type, const, macro, then method fa80ddf
11991200
- Reorder imports by default 164cf7d
12001201
- Group `extern crate` by default 3a138a2
12011202
- Make `error_on_line_overflow` false by default f146711

‎Cargo.lock

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

‎Cargo.toml

+3-4
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ generic-simd = ["bytecount/generic-simd"]
3636
annotate-snippets = { version = "0.9", features = ["color"] }
3737
anyhow = "1.0"
3838
bytecount = "0.6.4"
39-
cargo_metadata = "0.15.4"
39+
cargo_metadata = "0.18"
4040
clap = { version = "4.4.2", features = ["derive"] }
4141
clap-cargo = "0.12.0"
4242
diff = "0.1"
43-
dirs = "4.0"
43+
dirs = "5.0"
4444
getopts = "0.2"
4545
ignore = "0.4"
46-
itertools = "0.11"
47-
lazy_static = "1.4"
46+
itertools = "0.12"
4847
regex = "1.7"
4948
serde = { version = "1.0.160", features = ["derive"] }
5049
serde_json = "1.0"

‎Configurations.md

+33-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Configuring Rustfmt
22

3-
Rustfmt is designed to be very configurable. You can create a TOML file called `rustfmt.toml` or `.rustfmt.toml`, place it in the project or any other parent directory and it will apply the options in that file. If none of these directories contain such a file, both your home directory and a directory called `rustfmt` in your [global config directory](https://docs.rs/dirs/4.0.0/dirs/fn.config_dir.html) (e.g. `.config/rustfmt/`) are checked as well.
3+
Rustfmt is designed to be very configurable. You can create a TOML file called `rustfmt.toml` or `.rustfmt.toml`, place it in the project or any other parent directory and it will apply the options in that file. If none of these directories contain such a file, both your home directory and a directory called `rustfmt` in your [global config directory](https://docs.rs/dirs/5.0.1/dirs/fn.config_dir.html) (e.g. `.config/rustfmt/`) are checked as well.
44

55
A possible content of `rustfmt.toml` or `.rustfmt.toml` might look like this:
66

@@ -1050,15 +1050,25 @@ Max width for code snippets included in doc comments. Only used if [`format_code
10501050

10511051
## `format_generated_files`
10521052

1053-
Format generated files. A file is considered generated
1054-
if any of the first five lines contain a `@generated` comment marker.
1053+
Format generated files. A file is considered generated if any of the first several lines contain a `@generated` comment marker. The number of lines to check is configured by `generated_marker_line_search_limit`.
1054+
10551055
By default, generated files are reformatted, i. e. `@generated` marker is ignored.
10561056
This option is currently ignored for stdin (`@generated` in stdin is ignored.)
10571057

10581058
- **Default value**: `true`
10591059
- **Possible values**: `true`, `false`
10601060
- **Stable**: No (tracking issue: [#5080](https://github.com/rust-lang/rustfmt/issues/5080))
10611061

1062+
## `generated_marker_line_search_limit`
1063+
1064+
Number of lines to check for a `@generated` pragma header, starting from the top of the file. Setting this value to `0` will treat all files as non-generated. When`format_generated_files` is `true`, this option has no effect.
1065+
1066+
- **Default value**: `5`
1067+
- **Possible values**: any positive integer
1068+
- **Stable**: No (tracking issue: [#5080](https://github.com/rust-lang/rustfmt/issues/5080))
1069+
1070+
See also [format_generated_files](#format_generated_files) link here.
1071+
10621072
## `format_macro_matchers`
10631073

10641074
Format the metavariable matching patterns in macros.
@@ -1098,7 +1108,7 @@ See also [`format_macro_bodies`](#format_macro_bodies).
10981108

10991109
## `format_macro_bodies`
11001110

1101-
Format the bodies of macros.
1111+
Format the bodies of declarative macro definitions.
11021112

11031113
- **Default value**: `true`
11041114
- **Possible values**: `true`, `false`
@@ -1248,12 +1258,20 @@ Control the case of the letters in hexadecimal literal values
12481258

12491259
## `hide_parse_errors`
12501260

1251-
Do not show parse errors if the parser failed to parse files.
1261+
This option is deprecated and has been renamed to `show_parse_errors` to avoid confusion around the double negative default of `hide_parse_errors=false`.
12521262

12531263
- **Default value**: `false`
12541264
- **Possible values**: `true`, `false`
12551265
- **Stable**: No (tracking issue: [#3390](https://github.com/rust-lang/rustfmt/issues/3390))
12561266

1267+
## `show_parse_errors`
1268+
1269+
Show parse errors if the parser failed to parse files.
1270+
1271+
- **Default value**: `true`
1272+
- **Possible values**: `true`, `false`
1273+
- **Stable**: No (tracking issue: [#5977](https://github.com/rust-lang/rustfmt/issues/5977))
1274+
12571275
## `ignore`
12581276

12591277
Skip formatting files and directories that match the specified pattern.
@@ -1288,6 +1306,15 @@ If you want to ignore every file under the directory where you put your rustfmt.
12881306
ignore = ["/"]
12891307
```
12901308

1309+
If you want to allow specific paths that would otherwise be ignored, prefix those paths with a `!`:
1310+
1311+
```toml
1312+
ignore = ["bar_dir/*", "!bar_dir/*/what.rs"]
1313+
```
1314+
1315+
In this case, all files under `bar_dir` will be ignored, except files like `bar_dir/sub/what.rs`
1316+
or `bar_dir/another/what.rs`.
1317+
12911318
## `imports_indent`
12921319

12931320
Indent style of imports
@@ -1655,7 +1682,7 @@ use core::slice;
16551682

16561683
Controls whether arm bodies are wrapped in cases where the first line of the body cannot fit on the same line as the `=>` operator.
16571684

1658-
The Style Guide requires that bodies are block wrapped by default if a line break is required after the `=>`, but this option can be used to disable that behavior to prevent wrapping arm bodies in that event, so long as the body does not contain multiple statements nor line comments.
1685+
The Style Guide requires that bodies are block wrapped by default if a line break is required after the `=>`, but this option can be used to disable that behavior to prevent wrapping arm bodies in that event, so long as the body contains neither multiple statements nor line comments.
16591686

16601687
- **Default value**: `true`
16611688
- **Possible values**: `true`, `false`

‎Contributing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ example, the `issue-1111.rs` test file is configured by the file
5959
## Debugging
6060

6161
Some `rewrite_*` methods use the `debug!` macro for printing useful information.
62-
These messages can be printed by using the environment variable `RUSTFMT_LOG=rustfmt=DEBUG`.
62+
These messages can be printed by using the environment variable `RUSTFMT_LOG=debug`.
6363
These traces can be helpful in understanding which part of the code was used
6464
and get a better grasp on the execution flow.
6565

‎Processes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ In this Section, we describe how to stabilise an option of the rustfmt's configu
1616
Open a pull request that closes the tracking issue. The tracking issue is listed beside the option in `Configurations.md`.
1717

1818
- Update the `Config` enum marking the option as stable.
19-
- Update the the `Configuration.md` file marking the option as stable.
19+
- Update the `Configuration.md` file marking the option as stable.
2020
- Update `CHANGELOG.md` marking the option as stable.
2121

2222
## After the stabilisation

‎build.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ fn channel() -> String {
4040

4141
fn commit_hash() -> Option<String> {
4242
Command::new("git")
43-
.args(&["rev-parse", "--short", "HEAD"])
43+
.args(["rev-parse", "--short", "HEAD"])
4444
.output()
4545
.ok()
4646
.and_then(|r| String::from_utf8(r.stdout).ok())
4747
}
4848

4949
fn commit_date() -> Option<String> {
5050
Command::new("git")
51-
.args(&["log", "-1", "--date=short", "--pretty=format:%cd"])
51+
.args(["log", "-1", "--date=short", "--pretty=format:%cd"])
5252
.output()
5353
.ok()
5454
.and_then(|r| String::from_utf8(r.stdout).ok())

‎check_diff/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

0 commit comments

Comments
 (0)