Skip to content

Commit 0f11bed

Browse files
committed
---
yaml --- r: 275310 b: refs/heads/stable c: 17ae752 h: refs/heads/master
1 parent 86d5d6f commit 0f11bed

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 93a9ab1a1bb1e692516a07ece2ec6958c1aa0d3f
32+
refs/heads/stable: 17ae752093dca428c6c0ba4eb23678b522f33b18
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/bootstrap/bootstrap.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def download_rust_nightly(self):
7373

7474
if self.rustc().startswith(self.bin_root()) and \
7575
(not os.path.exists(self.rustc()) or self.rustc_out_of_date()):
76+
shutil.rmtree(self.bin_root())
7677
filename = "rust-std-nightly-" + self.build + ".tar.gz"
7778
url = "https://static.rust-lang.org/dist/" + self.snap_rustc_date()
7879
tarball = os.path.join(rustc_cache, filename)

branches/stable/src/bootstrap/build/mod.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ mod sanity;
3939
mod step;
4040
mod util;
4141

42+
#[cfg(windows)]
43+
mod job;
44+
45+
#[cfg(not(windows))]
46+
mod job {
47+
pub unsafe fn setup() {}
48+
}
49+
4250
pub use build::config::Config;
4351
pub use build::flags::Flags;
4452

@@ -114,14 +122,9 @@ impl Build {
114122
pub fn build(&mut self) {
115123
use build::step::Source::*;
116124

117-
// see comments in job.rs for what's going on here
118-
#[cfg(windows)]
119-
fn setup_job() {
120-
mod job;
121-
unsafe { job::setup() }
125+
unsafe {
126+
job::setup();
122127
}
123-
#[cfg(not(windows))] fn setup_job() {}
124-
setup_job();
125128

126129
if self.flags.clean {
127130
return clean::clean(self);

branches/stable/src/nightlies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
rustc: 2015-12-19
1+
rustc: 2016-02-17
22
cargo: 2016-01-21

0 commit comments

Comments
 (0)