Skip to content

Commit e6df930

Browse files
committed
---
yaml --- r: 273213 b: refs/heads/beta c: abd1cea h: refs/heads/master i: 273211: 6af4f9b
1 parent 988c1b6 commit e6df930

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+144
-400
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: abb1515c53d209be3e8c1e9e73c1a98bc86b8692
26+
refs/heads/beta: abd1cea14578a3fc9856e2dbbd9f40f2b2c3b6d5
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/bootstrap/build/channel.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,19 @@ pub fn collect(build: &mut Build) {
3636
match &build.config.channel[..] {
3737
"stable" => {
3838
build.release = release_num.to_string();
39-
build.package_vers = build.release.clone();
4039
build.unstable_features = false;
4140
}
4241
"beta" => {
4342
build.release = format!("{}-beta{}", release_num,
4443
prerelease_version);
45-
build.package_vers = "beta".to_string();
4644
build.unstable_features = false;
4745
}
4846
"nightly" => {
4947
build.release = format!("{}-nightly", release_num);
50-
build.package_vers = "nightly".to_string();
5148
build.unstable_features = true;
5249
}
5350
_ => {
5451
build.release = format!("{}-dev", release_num);
55-
build.package_vers = build.release.clone();
5652
build.unstable_features = true;
5753
}
5854
}

branches/beta/src/bootstrap/build/dist.rs

Lines changed: 0 additions & 290 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ mod check;
3434
mod clean;
3535
mod compile;
3636
mod config;
37-
mod dist;
3837
mod doc;
3938
mod flags;
4039
mod native;
@@ -77,7 +76,6 @@ pub struct Build {
7776
short_ver_hash: Option<String>,
7877
ver_date: Option<String>,
7978
version: String,
80-
package_vers: String,
8179
bootstrap_key: String,
8280

8381
// Runtime state filled in later on
@@ -123,7 +121,6 @@ impl Build {
123121
ver_date: None,
124122
version: String::new(),
125123
bootstrap_key: String::new(),
126-
package_vers: String::new(),
127124
cc: HashMap::new(),
128125
cxx: HashMap::new(),
129126
compiler_rt_built: RefCell::new(HashMap::new()),
@@ -211,12 +208,6 @@ impl Build {
211208
check::linkcheck(self, stage, target.target);
212209
}
213210

214-
DistDocs { stage } => dist::docs(self, stage, target.target),
215-
DistMingw { _dummy } => dist::mingw(self, target.target),
216-
DistRustc { stage } => dist::rustc(self, stage, target.target),
217-
DistStd { compiler } => dist::std(self, &compiler, target.target),
218-
219-
Dist { .. } |
220211
Doc { .. } | // pseudo-steps
221212
Check { .. } => {}
222213
}

0 commit comments

Comments
 (0)