Skip to content

Commit 147246c

Browse files
Make RemoteTestServer a bootstrap tool
There's no reason for it to be std-based
1 parent 0e64a94 commit 147246c

File tree

1 file changed

+1
-34
lines changed

1 file changed

+1
-34
lines changed

src/bootstrap/tool.rs

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ bootstrap_tool!(
341341
Compiletest, "src/tools/compiletest", "compiletest", llvm_tools = true;
342342
BuildManifest, "src/tools/build-manifest", "build-manifest";
343343
RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
344+
RemoteTestServer, "src/tools/remote-test-server", "remote-test-server";
344345
RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true;
345346
RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes";
346347
);
@@ -393,40 +394,6 @@ impl Step for ErrorIndex {
393394
}
394395
}
395396

396-
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
397-
pub struct RemoteTestServer {
398-
pub compiler: Compiler,
399-
pub target: Interned<String>,
400-
}
401-
402-
impl Step for RemoteTestServer {
403-
type Output = PathBuf;
404-
405-
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
406-
run.path("src/tools/remote-test-server")
407-
}
408-
409-
fn make_run(run: RunConfig<'_>) {
410-
run.builder.ensure(RemoteTestServer {
411-
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
412-
target: run.target,
413-
});
414-
}
415-
416-
fn run(self, builder: &Builder<'_>) -> PathBuf {
417-
builder.ensure(ToolBuild {
418-
compiler: self.compiler,
419-
target: self.target,
420-
tool: "remote-test-server",
421-
mode: Mode::ToolStd,
422-
path: "src/tools/remote-test-server",
423-
is_optional_tool: false,
424-
source_type: SourceType::InTree,
425-
extra_features: Vec::new(),
426-
}).expect("expected to build -- essential tool")
427-
}
428-
}
429-
430397
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
431398
pub struct Rustdoc {
432399
/// This should only ever be 0 or 2.

0 commit comments

Comments
 (0)