Skip to content

Commit 2fa33b0

Browse files
authored
Rollup merge of #141949 - onur-ozkan:move-test-float-parse, r=Kobzol
move `test-float-parse` tool into `src/tools` dir Obviously `test-float-parse` is a tool like any other in `src/tools`. cc `@tgross35`
2 parents 7100905 + 59fbe04 commit 2fa33b0

File tree

26 files changed

+10
-10
lines changed

26 files changed

+10
-10
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ members = [
44
# tidy-alphabetical-start
55
"compiler/rustc",
66
"src/build_helper",
7-
"src/etc/test-float-parse",
87
"src/rustc-std-workspace/rustc-std-workspace-alloc",
98
"src/rustc-std-workspace/rustc-std-workspace-core",
109
"src/rustc-std-workspace/rustc-std-workspace-std",
@@ -41,6 +40,7 @@ members = [
4140
"src/tools/rustdoc-themes",
4241
"src/tools/rustfmt",
4342
"src/tools/suggest-tests",
43+
"src/tools/test-float-parse",
4444
"src/tools/tidy",
4545
"src/tools/tier-check",
4646
"src/tools/unicode-table-generator",

library/core/src/num/dec2flt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
//!
5959
//! There are unit tests but they are woefully inadequate at ensuring correctness, they only cover
6060
//! a small percentage of possible errors. Far more extensive tests are located in the directory
61-
//! `src/etc/test-float-parse` as a Rust program.
61+
//! `src/tools/test-float-parse` as a Rust program.
6262
//!
6363
//! A note on integer overflow: Many parts of this file perform arithmetic with the decimal
6464
//! exponent `e`. Primarily, we shift the decimal point around: Before the first decimal digit,

src/bootstrap/mk/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ check-aux:
5151
$(Q)$(BOOTSTRAP) test --stage 2 \
5252
src/tools/cargo \
5353
src/tools/cargotest \
54-
src/etc/test-float-parse \
54+
src/tools/test-float-parse \
5555
$(BOOTSTRAP_ARGS)
5656
# Run standard library tests in Miri.
5757
$(Q)MIRIFLAGS="-Zmiri-strict-provenance" \

src/bootstrap/src/core/build_steps/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ tool_check_step!(Miri { path: "src/tools/miri" });
528528
tool_check_step!(CargoMiri { path: "src/tools/miri/cargo-miri" });
529529
tool_check_step!(Rustfmt { path: "src/tools/rustfmt" });
530530
tool_check_step!(MiroptTestTools { path: "src/tools/miropt-test-tools" });
531-
tool_check_step!(TestFloatParse { path: "src/etc/test-float-parse" });
531+
tool_check_step!(TestFloatParse { path: "src/tools/test-float-parse" });
532532
tool_check_step!(FeaturesStatusDump { path: "src/tools/features-status-dump" });
533533

534534
tool_check_step!(Bootstrap { path: "src/bootstrap", default: false });

src/bootstrap/src/core/build_steps/clippy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ lint_any!(
355355
Rustfmt, "src/tools/rustfmt", "rustfmt";
356356
RustInstaller, "src/tools/rust-installer", "rust-installer";
357357
Tidy, "src/tools/tidy", "tidy";
358-
TestFloatParse, "src/etc/test-float-parse", "test-float-parse";
358+
TestFloatParse, "src/tools/test-float-parse", "test-float-parse";
359359
);
360360

361361
#[derive(Debug, Clone, PartialEq, Eq, Hash)]

src/bootstrap/src/core/build_steps/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3544,7 +3544,7 @@ impl Step for CodegenGCC {
35443544
}
35453545

35463546
/// Test step that does two things:
3547-
/// - Runs `cargo test` for the `src/etc/test-float-parse` tool.
3547+
/// - Runs `cargo test` for the `src/tools/test-float-parse` tool.
35483548
/// - Invokes the `test-float-parse` tool to test the standard library's
35493549
/// float parsing routines.
35503550
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -3559,7 +3559,7 @@ impl Step for TestFloatParse {
35593559
const DEFAULT: bool = true;
35603560

35613561
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
3562-
run.path("src/etc/test-float-parse")
3562+
run.path("src/tools/test-float-parse")
35633563
}
35643564

35653565
fn make_run(run: RunConfig<'_>) {

src/bootstrap/src/core/build_steps/tool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ impl Step for TestFloatParse {
12691269
const DEFAULT: bool = false;
12701270

12711271
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
1272-
run.path("src/etc/test-float-parse")
1272+
run.path("src/tools/test-float-parse")
12731273
}
12741274

12751275
fn run(self, builder: &Builder<'_>) -> ToolBuildResult {
@@ -1281,7 +1281,7 @@ impl Step for TestFloatParse {
12811281
target: bootstrap_host,
12821282
tool: "test-float-parse",
12831283
mode: Mode::ToolStd,
1284-
path: "src/etc/test-float-parse",
1284+
path: "src/tools/test-float-parse",
12851285
source_type: SourceType::InTree,
12861286
extra_features: Vec::new(),
12871287
allow_features: Self::ALLOW_FEATURES,

src/tools/tidy/src/deps.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ pub(crate) const WORKSPACES: &[(&str, ExceptionList, Option<(&[&str], &[&str])>,
7474
("compiler/rustc_codegen_gcc", EXCEPTIONS_GCC, None, &[]),
7575
("src/bootstrap", EXCEPTIONS_BOOTSTRAP, None, &[]),
7676
("src/ci/docker/host-x86_64/test-various/uefi_qemu_test", EXCEPTIONS_UEFI_QEMU_TEST, None, &[]),
77-
("src/etc/test-float-parse", EXCEPTIONS, None, &[]),
7877
("src/tools/cargo", EXCEPTIONS_CARGO, None, &["src/tools/cargo"]),
7978
//("src/tools/miri/test-cargo-miri", &[], None), // FIXME uncomment once all deps are vendored
8079
//("src/tools/miri/test_dependencies", &[], None), // FIXME uncomment once all deps are vendored
8180
("src/tools/rust-analyzer", EXCEPTIONS_RUST_ANALYZER, None, &[]),
8281
("src/tools/rustbook", EXCEPTIONS_RUSTBOOK, None, &["src/doc/book", "src/doc/reference"]),
8382
("src/tools/rustc-perf", EXCEPTIONS_RUSTC_PERF, None, &["src/tools/rustc-perf"]),
83+
("src/tools/test-float-parse", EXCEPTIONS, None, &[]),
8484
// tidy-alphabetical-end
8585
];
8686

0 commit comments

Comments
 (0)