mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Cargo.lock dependencies

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1238
src/Cargo.lock
View file

File diff suppressed because it is too large Load diff

4
src/bootstrap/lib.rs
View file

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

5
src/bootstrap/tool.rs
View file

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