Update Cargo.lock dependencies

Run `cargo update` and let's see how far we can get!
This commit is contained in:
Alex Crichton 2018-07-02 09:33:16 -07:00
parent ef41cf0288
commit d825115978
3 changed files with 627 additions and 620 deletions

File diff suppressed because it is too large Load diff

View file

@ -337,13 +337,14 @@ pub enum Mode {
/// Compile a tool which uses all libraries we compile (up to rustc).
/// Doesn't use the stage0 compiler libraries like "other", and includes
/// tools like rustdoc, cargo, rls, etc.
ToolStd,
ToolRustc,
}
impl Mode {
pub fn is_tool(&self) -> bool {
match self {
Mode::ToolBootstrap | Mode::ToolRustc => true,
Mode::ToolBootstrap | Mode::ToolRustc | Mode::ToolStd => true,
_ => false
}
}
@ -554,6 +555,7 @@ fn stage_out(&self, compiler: Compiler, mode: Mode) -> PathBuf {
Mode::Codegen => "-rustc",
Mode::Rustc => "-rustc",
Mode::ToolBootstrap => "-bootstrap-tools",
Mode::ToolStd => "-tools",
Mode::ToolRustc => "-tools",
};
self.out.join(&*compiler.host)

View file

@ -107,6 +107,9 @@ fn run(self, builder: &Builder) -> Option<PathBuf> {
Mode::ToolRustc => {
builder.ensure(compile::Rustc { compiler, target })
}
Mode::ToolStd => {
builder.ensure(compile::Std { compiler, target })
}
Mode::ToolBootstrap => {} // uses downloaded stage0 compiler libs
_ => panic!("unexpected Mode for tool build")
}
@ -380,7 +383,7 @@ fn run(self, builder: &Builder) -> PathBuf {
compiler: self.compiler,
target: self.target,
tool: "remote-test-server",
mode: Mode::ToolBootstrap,
mode: Mode::ToolStd,
path: "src/tools/remote-test-server",
is_ext_tool: false,
extra_features: Vec::new(),