From 59fbe04a5249d2da56b19bf0e7f4f017064a3866 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Tue, 3 Jun 2025 10:38:15 +0300
Subject: [PATCH] move `test-float-parse` tool into `src/tools` dir

Obviously `test-float-parse` is a tool like any other in `src/tools`.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
 Cargo.toml                                                    | 2 +-
 library/core/src/num/dec2flt/mod.rs                           | 2 +-
 src/bootstrap/mk/Makefile.in                                  | 2 +-
 src/bootstrap/src/core/build_steps/check.rs                   | 2 +-
 src/bootstrap/src/core/build_steps/clippy.rs                  | 2 +-
 src/bootstrap/src/core/build_steps/test.rs                    | 4 ++--
 src/bootstrap/src/core/build_steps/tool.rs                    | 4 ++--
 src/{etc => tools}/test-float-parse/Cargo.lock                | 0
 src/{etc => tools}/test-float-parse/Cargo.toml                | 0
 src/{etc => tools}/test-float-parse/README.md                 | 0
 src/{etc => tools}/test-float-parse/src/gen_/exhaustive.rs    | 0
 src/{etc => tools}/test-float-parse/src/gen_/exponents.rs     | 0
 src/{etc => tools}/test-float-parse/src/gen_/fuzz.rs          | 0
 src/{etc => tools}/test-float-parse/src/gen_/integers.rs      | 0
 .../test-float-parse/src/gen_/long_fractions.rs               | 0
 src/{etc => tools}/test-float-parse/src/gen_/many_digits.rs   | 0
 src/{etc => tools}/test-float-parse/src/gen_/sparse.rs        | 0
 src/{etc => tools}/test-float-parse/src/gen_/spot_checks.rs   | 0
 src/{etc => tools}/test-float-parse/src/gen_/subnorm.rs       | 0
 src/{etc => tools}/test-float-parse/src/lib.rs                | 0
 src/{etc => tools}/test-float-parse/src/main.rs               | 0
 src/{etc => tools}/test-float-parse/src/traits.rs             | 0
 src/{etc => tools}/test-float-parse/src/ui.rs                 | 0
 src/{etc => tools}/test-float-parse/src/validate.rs           | 0
 src/{etc => tools}/test-float-parse/src/validate/tests.rs     | 0
 src/tools/tidy/src/deps.rs                                    | 2 +-
 26 files changed, 10 insertions(+), 10 deletions(-)
 rename src/{etc => tools}/test-float-parse/Cargo.lock (100%)
 rename src/{etc => tools}/test-float-parse/Cargo.toml (100%)
 rename src/{etc => tools}/test-float-parse/README.md (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/exhaustive.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/exponents.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/fuzz.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/integers.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/long_fractions.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/many_digits.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/sparse.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/spot_checks.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/gen_/subnorm.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/lib.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/main.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/traits.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/ui.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/validate.rs (100%)
 rename src/{etc => tools}/test-float-parse/src/validate/tests.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 16ff0f61593ae..c4d2a06f4cb17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,6 @@ members = [
 # tidy-alphabetical-start
   "compiler/rustc",
   "src/build_helper",
-  "src/etc/test-float-parse",
   "src/rustc-std-workspace/rustc-std-workspace-alloc",
   "src/rustc-std-workspace/rustc-std-workspace-core",
   "src/rustc-std-workspace/rustc-std-workspace-std",
@@ -41,6 +40,7 @@ members = [
   "src/tools/rustdoc-themes",
   "src/tools/rustfmt",
   "src/tools/suggest-tests",
+  "src/tools/test-float-parse",
   "src/tools/tidy",
   "src/tools/tier-check",
   "src/tools/unicode-table-generator",
diff --git a/library/core/src/num/dec2flt/mod.rs b/library/core/src/num/dec2flt/mod.rs
index abad7acb1046a..1844cd9808268 100644
--- a/library/core/src/num/dec2flt/mod.rs
+++ b/library/core/src/num/dec2flt/mod.rs
@@ -58,7 +58,7 @@
 //!
 //! There are unit tests but they are woefully inadequate at ensuring correctness, they only cover
 //! a small percentage of possible errors. Far more extensive tests are located in the directory
-//! `src/etc/test-float-parse` as a Rust program.
+//! `src/tools/test-float-parse` as a Rust program.
 //!
 //! A note on integer overflow: Many parts of this file perform arithmetic with the decimal
 //! exponent `e`. Primarily, we shift the decimal point around: Before the first decimal digit,
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 08a288170fa30..5473d9e6340c5 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -51,7 +51,7 @@ check-aux:
 	$(Q)$(BOOTSTRAP) test --stage 2 \
 		src/tools/cargo \
 		src/tools/cargotest \
-		src/etc/test-float-parse \
+		src/tools/test-float-parse \
 		$(BOOTSTRAP_ARGS)
 	# Run standard library tests in Miri.
 	$(Q)$(BOOTSTRAP) miri --stage 2 \
diff --git a/src/bootstrap/src/core/build_steps/check.rs b/src/bootstrap/src/core/build_steps/check.rs
index 922578f309a79..5b64212e31483 100644
--- a/src/bootstrap/src/core/build_steps/check.rs
+++ b/src/bootstrap/src/core/build_steps/check.rs
@@ -528,7 +528,7 @@ tool_check_step!(Miri { path: "src/tools/miri" });
 tool_check_step!(CargoMiri { path: "src/tools/miri/cargo-miri" });
 tool_check_step!(Rustfmt { path: "src/tools/rustfmt" });
 tool_check_step!(MiroptTestTools { path: "src/tools/miropt-test-tools" });
-tool_check_step!(TestFloatParse { path: "src/etc/test-float-parse" });
+tool_check_step!(TestFloatParse { path: "src/tools/test-float-parse" });
 tool_check_step!(FeaturesStatusDump { path: "src/tools/features-status-dump" });
 
 tool_check_step!(Bootstrap { path: "src/bootstrap", default: false });
diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs
index 5e8d6bba84131..0652c08ff496e 100644
--- a/src/bootstrap/src/core/build_steps/clippy.rs
+++ b/src/bootstrap/src/core/build_steps/clippy.rs
@@ -355,7 +355,7 @@ lint_any!(
     Rustfmt, "src/tools/rustfmt", "rustfmt";
     RustInstaller, "src/tools/rust-installer", "rust-installer";
     Tidy, "src/tools/tidy", "tidy";
-    TestFloatParse, "src/etc/test-float-parse", "test-float-parse";
+    TestFloatParse, "src/tools/test-float-parse", "test-float-parse";
 );
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 22ab3e56a9c96..22a458bac981c 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -3544,7 +3544,7 @@ impl Step for CodegenGCC {
 }
 
 /// Test step that does two things:
-/// - Runs `cargo test` for the `src/etc/test-float-parse` tool.
+/// - Runs `cargo test` for the `src/tools/test-float-parse` tool.
 /// - Invokes the `test-float-parse` tool to test the standard library's
 ///   float parsing routines.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -3559,7 +3559,7 @@ impl Step for TestFloatParse {
     const DEFAULT: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/etc/test-float-parse")
+        run.path("src/tools/test-float-parse")
     }
 
     fn make_run(run: RunConfig<'_>) {
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
index 173b3ff08162d..6643d87882fc2 100644
--- a/src/bootstrap/src/core/build_steps/tool.rs
+++ b/src/bootstrap/src/core/build_steps/tool.rs
@@ -1269,7 +1269,7 @@ impl Step for TestFloatParse {
     const DEFAULT: bool = false;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/etc/test-float-parse")
+        run.path("src/tools/test-float-parse")
     }
 
     fn run(self, builder: &Builder<'_>) -> ToolBuildResult {
@@ -1281,7 +1281,7 @@ impl Step for TestFloatParse {
             target: bootstrap_host,
             tool: "test-float-parse",
             mode: Mode::ToolStd,
-            path: "src/etc/test-float-parse",
+            path: "src/tools/test-float-parse",
             source_type: SourceType::InTree,
             extra_features: Vec::new(),
             allow_features: Self::ALLOW_FEATURES,
diff --git a/src/etc/test-float-parse/Cargo.lock b/src/tools/test-float-parse/Cargo.lock
similarity index 100%
rename from src/etc/test-float-parse/Cargo.lock
rename to src/tools/test-float-parse/Cargo.lock
diff --git a/src/etc/test-float-parse/Cargo.toml b/src/tools/test-float-parse/Cargo.toml
similarity index 100%
rename from src/etc/test-float-parse/Cargo.toml
rename to src/tools/test-float-parse/Cargo.toml
diff --git a/src/etc/test-float-parse/README.md b/src/tools/test-float-parse/README.md
similarity index 100%
rename from src/etc/test-float-parse/README.md
rename to src/tools/test-float-parse/README.md
diff --git a/src/etc/test-float-parse/src/gen_/exhaustive.rs b/src/tools/test-float-parse/src/gen_/exhaustive.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/exhaustive.rs
rename to src/tools/test-float-parse/src/gen_/exhaustive.rs
diff --git a/src/etc/test-float-parse/src/gen_/exponents.rs b/src/tools/test-float-parse/src/gen_/exponents.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/exponents.rs
rename to src/tools/test-float-parse/src/gen_/exponents.rs
diff --git a/src/etc/test-float-parse/src/gen_/fuzz.rs b/src/tools/test-float-parse/src/gen_/fuzz.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/fuzz.rs
rename to src/tools/test-float-parse/src/gen_/fuzz.rs
diff --git a/src/etc/test-float-parse/src/gen_/integers.rs b/src/tools/test-float-parse/src/gen_/integers.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/integers.rs
rename to src/tools/test-float-parse/src/gen_/integers.rs
diff --git a/src/etc/test-float-parse/src/gen_/long_fractions.rs b/src/tools/test-float-parse/src/gen_/long_fractions.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/long_fractions.rs
rename to src/tools/test-float-parse/src/gen_/long_fractions.rs
diff --git a/src/etc/test-float-parse/src/gen_/many_digits.rs b/src/tools/test-float-parse/src/gen_/many_digits.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/many_digits.rs
rename to src/tools/test-float-parse/src/gen_/many_digits.rs
diff --git a/src/etc/test-float-parse/src/gen_/sparse.rs b/src/tools/test-float-parse/src/gen_/sparse.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/sparse.rs
rename to src/tools/test-float-parse/src/gen_/sparse.rs
diff --git a/src/etc/test-float-parse/src/gen_/spot_checks.rs b/src/tools/test-float-parse/src/gen_/spot_checks.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/spot_checks.rs
rename to src/tools/test-float-parse/src/gen_/spot_checks.rs
diff --git a/src/etc/test-float-parse/src/gen_/subnorm.rs b/src/tools/test-float-parse/src/gen_/subnorm.rs
similarity index 100%
rename from src/etc/test-float-parse/src/gen_/subnorm.rs
rename to src/tools/test-float-parse/src/gen_/subnorm.rs
diff --git a/src/etc/test-float-parse/src/lib.rs b/src/tools/test-float-parse/src/lib.rs
similarity index 100%
rename from src/etc/test-float-parse/src/lib.rs
rename to src/tools/test-float-parse/src/lib.rs
diff --git a/src/etc/test-float-parse/src/main.rs b/src/tools/test-float-parse/src/main.rs
similarity index 100%
rename from src/etc/test-float-parse/src/main.rs
rename to src/tools/test-float-parse/src/main.rs
diff --git a/src/etc/test-float-parse/src/traits.rs b/src/tools/test-float-parse/src/traits.rs
similarity index 100%
rename from src/etc/test-float-parse/src/traits.rs
rename to src/tools/test-float-parse/src/traits.rs
diff --git a/src/etc/test-float-parse/src/ui.rs b/src/tools/test-float-parse/src/ui.rs
similarity index 100%
rename from src/etc/test-float-parse/src/ui.rs
rename to src/tools/test-float-parse/src/ui.rs
diff --git a/src/etc/test-float-parse/src/validate.rs b/src/tools/test-float-parse/src/validate.rs
similarity index 100%
rename from src/etc/test-float-parse/src/validate.rs
rename to src/tools/test-float-parse/src/validate.rs
diff --git a/src/etc/test-float-parse/src/validate/tests.rs b/src/tools/test-float-parse/src/validate/tests.rs
similarity index 100%
rename from src/etc/test-float-parse/src/validate/tests.rs
rename to src/tools/test-float-parse/src/validate/tests.rs
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 9f333cc43cf8c..fdca7a7a40e20 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -74,13 +74,13 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>,
     ("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None, &[]),
     ("src/bootstrap", EXCEPTIONS_BOOTSTRAP, None, &[]),
     ("src/ci/docker/host-x86_64/test-various/uefi_qemu_test", EXCEPTIONS_UEFI_QEMU_TEST, None, &[]),
-    ("src/etc/test-float-parse", EXCEPTIONS, None, &[]),
     ("src/tools/cargo", EXCEPTIONS_CARGO, None, &["src/tools/cargo"]),
     //("src/tools/miri/test-cargo-miri", &[], None), // FIXME uncomment once all deps are vendored
     //("src/tools/miri/test_dependencies", &[], None), // FIXME uncomment once all deps are vendored
     ("src/tools/rust-analyzer", EXCEPTIONS_RUST_ANALYZER, None, &[]),
     ("src/tools/rustbook", EXCEPTIONS_RUSTBOOK, None, &["src/doc/book", "src/doc/reference"]),
     ("src/tools/rustc-perf", EXCEPTIONS_RUSTC_PERF, None, &["src/tools/rustc-perf"]),
+    ("src/tools/test-float-parse", EXCEPTIONS, None, &[]),
     // tidy-alphabetical-end
 ];