From f65d04a1092527db2396d517bd7f20987b025170 Mon Sep 17 00:00:00 2001 From: hattizai Date: Tue, 2 Jul 2024 11:10:54 +0800 Subject: [PATCH 1/2] fix link syntax --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89e90fb17dd..97b73c71146 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -238,7 +238,7 @@ ### Added -- New configuration option (`skip_macro_invocations`)[https://rust-lang.github.io/rustfmt/?version=master&search=#skip_macro_invocations] [#5347](https://github.com/rust-lang/rustfmt/pull/5347) that can be used to globally define a single enumerated list of macro calls that rustfmt should skip formatting. rustfmt [currently also supports this via a custom tool attribute](https://github.com/rust-lang/rustfmt#tips), however, these cannot be used in all contexts because [custom inner attributes are unstable](https://github.com/rust-lang/rust/issues/54726) +- New configuration option [`skip_macro_invocations`](https://rust-lang.github.io/rustfmt/?version=master&search=#skip_macro_invocations) [#5347](https://github.com/rust-lang/rustfmt/pull/5347) that can be used to globally define a single enumerated list of macro calls that rustfmt should skip formatting. rustfmt [currently also supports this via a custom tool attribute](https://github.com/rust-lang/rustfmt#tips), however, these cannot be used in all contexts because [custom inner attributes are unstable](https://github.com/rust-lang/rust/issues/54726) ### Misc From 533b760f8d20522c9d88f9dec45e68a02cec0c6f Mon Sep 17 00:00:00 2001 From: hattizai Date: Tue, 2 Jul 2024 11:21:05 +0800 Subject: [PATCH 2/2] remove duplicate word --- src/config/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/mod.rs b/src/config/mod.rs index 9484b2e5829..eb92b8f6eeb 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -256,7 +256,7 @@ impl Config { /// one. pub(super) fn from_resolved_toml_path(dir: &Path) -> Result<(Config, Option), Error> { /// Try to find a project file in the given directory and its parents. - /// Returns the path of a the nearest project file if one exists, + /// Returns the path of the nearest project file if one exists, /// or `None` if no project file was found. fn resolve_project_file(dir: &Path) -> Result, Error> { let mut current = if dir.is_relative() {