Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #6372

Merged
merged 1 commit into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
use std::num::{NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64};
```
[style guide's version sorting algorithm]: https://doc.rust-lang.org/nightly/style-guide/#sorting
- When parsing rustfmt configurations fails, rustfmt will now include the path to the toml file in the erorr message [#6302](https://github.com/rust-lang/rustfmt/issues/6302)
- When parsing rustfmt configurations fails, rustfmt will now include the path to the toml file in the error message [#6302](https://github.com/rust-lang/rustfmt/issues/6302)

### Added
- rustfmt now formats trailing where clauses in type aliases [#5887](https://github.com/rust-lang/rustfmt/pull/5887)
Expand Down Expand Up @@ -133,7 +133,7 @@
### Changed

- `hide_parse_errors` has been soft deprecated and it's been renamed to `show_parse_errors` [#5961](https://github.com/rust-lang/rustfmt/pull/5961).
- The diff output produced by `rustfmt --check` is more compatable with editors that support navigating directly to line numbers [#5971](https://github.com/rust-lang/rustfmt/pull/5971)
- The diff output produced by `rustfmt --check` is more compatible with editors that support navigating directly to line numbers [#5971](https://github.com/rust-lang/rustfmt/pull/5971)
- When using `version=Two`, the `trace!` macro from the [log crate] is now formatted similarly to `debug!`, `info!`, `warn!`, and `error!` [#5987](https://github.com/rust-lang/rustfmt/issues/5987).

[log crate]: https://crates.io/crates/log
Expand Down
4 changes: 2 additions & 2 deletions src/test/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ fn parser_errors_in_submods_are_surfaced() {
{
assert_eq!(&module, exp_mod_name);
if let ModuleResolutionErrorKind::ParseError {
file: unparseable_file,
file: unparsable_file,
} = kind
{
assert_eq!(
unparseable_file,
unparsable_file,
PathBuf::from("tests/parser/issue-4126/invalid.rs"),
);
} else {
Expand Down
6 changes: 3 additions & 3 deletions tests/source/enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub enum Test {
pub enum Foo<'a, Y: Baz> where X: Whatever
{ A, }

enum EmtpyWithComment {
enum EmptyWithComment {
// Some comment
}

Expand Down Expand Up @@ -74,7 +74,7 @@ where I: Iterator<Item = T> {
}


enum EmtpyWithComment {
enum EmptyWithComment {
// Some comment
}

Expand All @@ -94,7 +94,7 @@ fn nested_enum_test() {
}
}

pub struct EmtpyWithComment {
pub struct EmptyWithComment {
// FIXME: Implement this struct
}

Expand Down
6 changes: 3 additions & 3 deletions tests/target/enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ where
A,
}

enum EmtpyWithComment {
enum EmptyWithComment {
// Some comment
}

Expand Down Expand Up @@ -96,7 +96,7 @@ where
Right { list: I, root: T }, // Post Comment
}

enum EmtpyWithComment {
enum EmptyWithComment {
// Some comment
}

Expand Down Expand Up @@ -135,7 +135,7 @@ fn nested_enum_test() {
}
}

pub struct EmtpyWithComment {
pub struct EmptyWithComment {
// FIXME: Implement this struct
}

Expand Down
2 changes: 1 addition & 1 deletion tests/target/issue_4573.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// rustmft-use_small_heuristics:Max
// rustmft-merge_derives:false
// These are the same rustfmt configuration options that are used
// in the comiler as of ce39461ca75a and 8eb7c58dbb7b
// in the compiler as of ce39461ca75a and 8eb7c58dbb7b
// These are commits in https://github.com/rust-lang/rust

#![no_std] // inner attribute comment
Expand Down
Loading