Skip to content

Commit 1cb958a

Browse files
Rollup merge of rust-lang#113010 - klensy:ri-rls-fmt, r=ozkanonur
rust-installer & rls: remove exclusion from rustfmt & tidy <strike>based on rust-lang#112884</strike> `rust-installer` and `rls` no longer submodules, but not removed from exclude list for rustfmt and tidy, preventing running fmt and lints on them.
2 parents dfe0683 + d5dbe86 commit 1cb958a

File tree

12 files changed

+881
-888
lines changed

12 files changed

+881
-888
lines changed

rustfmt.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ignore = [
1616
"tests",
1717

1818
# do not format submodules
19+
# FIXME: sync submodule list with tidy/bootstrap/etc
20+
# tidy/src/walk.rs:filter_dirs
1921
"library/backtrace",
2022
"library/portable-simd",
2123
"library/stdarch",
@@ -31,10 +33,8 @@ ignore = [
3133
"src/tools/cargo",
3234
"src/tools/clippy",
3335
"src/tools/miri",
34-
"src/tools/rls",
3536
"src/tools/rust-analyzer",
3637
"src/tools/rustfmt",
37-
"src/tools/rust-installer",
3838

3939
# these are ignored by a standard cargo fmt run
4040
"compiler/rustc_codegen_cranelift/y.rs", # running rustfmt breaks this file

src/bootstrap/tool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ bootstrap_tool!(
289289
Compiletest, "src/tools/compiletest", "compiletest", is_unstable_tool = true, allow_features = "test";
290290
BuildManifest, "src/tools/build-manifest", "build-manifest";
291291
RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
292-
RustInstaller, "src/tools/rust-installer", "rust-installer", is_external_tool = true;
292+
RustInstaller, "src/tools/rust-installer", "rust-installer";
293293
RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes";
294294
ExpandYamlAnchors, "src/tools/expand-yaml-anchors", "expand-yaml-anchors";
295295
LintDocs, "src/tools/lint-docs", "lint-docs";

0 commit comments

Comments
 (0)