File tree Expand file tree Collapse file tree 4 files changed +13
-9
lines changed Expand file tree Collapse file tree 4 files changed +13
-9
lines changed Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
29
29
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
30
30
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
31
31
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32
- refs/heads/stable: 93a9ab1a1bb1e692516a07ece2ec6958c1aa0d3f
32
+ refs/heads/stable: 17ae752093dca428c6c0ba4eb23678b522f33b18
33
33
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
34
34
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
35
35
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e
Original file line number Diff line number Diff line change @@ -73,6 +73,7 @@ def download_rust_nightly(self):
73
73
74
74
if self .rustc ().startswith (self .bin_root ()) and \
75
75
(not os .path .exists (self .rustc ()) or self .rustc_out_of_date ()):
76
+ shutil .rmtree (self .bin_root ())
76
77
filename = "rust-std-nightly-" + self .build + ".tar.gz"
77
78
url = "https://static.rust-lang.org/dist/" + self .snap_rustc_date ()
78
79
tarball = os .path .join (rustc_cache , filename )
Original file line number Diff line number Diff line change @@ -39,6 +39,14 @@ mod sanity;
39
39
mod step;
40
40
mod util;
41
41
42
+ #[ cfg( windows) ]
43
+ mod job;
44
+
45
+ #[ cfg( not( windows) ) ]
46
+ mod job {
47
+ pub unsafe fn setup ( ) { }
48
+ }
49
+
42
50
pub use build:: config:: Config ;
43
51
pub use build:: flags:: Flags ;
44
52
@@ -114,14 +122,9 @@ impl Build {
114
122
pub fn build ( & mut self ) {
115
123
use build:: step:: Source :: * ;
116
124
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 ( ) ;
122
127
}
123
- #[ cfg( not( windows) ) ] fn setup_job ( ) { }
124
- setup_job ( ) ;
125
128
126
129
if self . flags . clean {
127
130
return clean:: clean ( self ) ;
Original file line number Diff line number Diff line change 1
- rustc: 2015-12-19
1
+ rustc: 2016-02-17
2
2
cargo: 2016-01-21
You can’t perform that action at this time.
0 commit comments