Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d825115

Browse files
committedJul 5, 2018
Update Cargo.lock dependencies
Run `cargo update` and let's see how far we can get!
1 parent ef41cf0 commit d825115

File tree

3 files changed

+627
-620
lines changed

3 files changed

+627
-620
lines changed
 

‎src/Cargo.lock

Lines changed: 620 additions & 618 deletions
Large diffs are not rendered by default.

‎src/bootstrap/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,13 +337,14 @@ pub enum Mode {
337337
/// Compile a tool which uses all libraries we compile (up to rustc).
338338
/// Doesn't use the stage0 compiler libraries like "other", and includes
339339
/// tools like rustdoc, cargo, rls, etc.
340+
ToolStd,
340341
ToolRustc,
341342
}
342343

343344
impl Mode {
344345
pub fn is_tool(&self) -> bool {
345346
match self {
346-
Mode::ToolBootstrap | Mode::ToolRustc => true,
347+
Mode::ToolBootstrap | Mode::ToolRustc | Mode::ToolStd => true,
347348
_ => false
348349
}
349350
}
@@ -554,6 +555,7 @@ impl Build {
554555
Mode::Codegen => "-rustc",
555556
Mode::Rustc => "-rustc",
556557
Mode::ToolBootstrap => "-bootstrap-tools",
558+
Mode::ToolStd => "-tools",
557559
Mode::ToolRustc => "-tools",
558560
};
559561
self.out.join(&*compiler.host)

‎src/bootstrap/tool.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ impl Step for ToolBuild {
107107
Mode::ToolRustc => {
108108
builder.ensure(compile::Rustc { compiler, target })
109109
}
110+
Mode::ToolStd => {
111+
builder.ensure(compile::Std { compiler, target })
112+
}
110113
Mode::ToolBootstrap => {} // uses downloaded stage0 compiler libs
111114
_ => panic!("unexpected Mode for tool build")
112115
}
@@ -380,7 +383,7 @@ impl Step for RemoteTestServer {
380383
compiler: self.compiler,
381384
target: self.target,
382385
tool: "remote-test-server",
383-
mode: Mode::ToolBootstrap,
386+
mode: Mode::ToolStd,
384387
path: "src/tools/remote-test-server",
385388
is_ext_tool: false,
386389
extra_features: Vec::new(),

0 commit comments

Comments
 (0)
Please sign in to comment.