From 0b7ee9d522242d6320d1066d3ba9d2314a576e8b Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro@pietroalbini.org>
Date: Mon, 12 Oct 2020 19:40:35 +0200
Subject: [PATCH] build-manifest: bundle the rustc version in the binary
---
src/bootstrap/dist.rs | 1 -
src/bootstrap/run.rs | 1 -
src/tools/build-manifest/src/main.rs | 3 +--
src/tools/build-manifest/src/versions.rs | 17 ++++++-----------
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 12533d29809..dd4cf9d5953 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -2353,7 +2353,6 @@ impl Step for HashSign {
cmd.arg(today.trim());
cmd.arg(addr);
cmd.arg(&builder.config.channel);
- cmd.arg(&builder.version);
cmd.env("BUILD_MANIFEST_LEGACY", "1");
builder.create_dir(&distdir(builder));
diff --git a/src/bootstrap/run.rs b/src/bootstrap/run.rs
index d8169549c07..7c64e5a0aad 100644
--- a/src/bootstrap/run.rs
+++ b/src/bootstrap/run.rs
@@ -77,7 +77,6 @@ impl Step for BuildManifest {
cmd.arg(today.trim());
cmd.arg(addr);
cmd.arg(&builder.config.channel);
- cmd.arg(&builder.version);
builder.create_dir(&distdir(builder));
builder.run(&mut cmd);
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 1515f46e03a..cb04900c737 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -226,7 +226,6 @@ fn main() {
let date = args.next().unwrap();
let s3_address = args.next().unwrap();
let channel = args.next().unwrap();
- let rustc_version = args.next().unwrap();
// Do not ask for a passphrase while manually testing
let mut passphrase = String::new();
@@ -236,7 +235,7 @@ fn main() {
}
Builder {
- versions: Versions::new(&channel, &rustc_version, &input).unwrap(),
+ versions: Versions::new(&channel, &input).unwrap(),
input,
output,
diff --git a/src/tools/build-manifest/src/versions.rs b/src/tools/build-manifest/src/versions.rs
index c2bce0f1cf3..79f2ef8dfc4 100644
--- a/src/tools/build-manifest/src/versions.rs
+++ b/src/tools/build-manifest/src/versions.rs
@@ -7,6 +7,7 @@ use std::path::{Path, PathBuf};
use tar::Archive;
const DEFAULT_TARGET: &str = "x86_64-unknown-linux-gnu";
+const RUSTC_VERSION: &str = include_str!("../../../version");
#[derive(Debug, Hash, Eq, PartialEq, Clone)]
pub(crate) enum PkgType {
@@ -87,19 +88,13 @@ pub(crate) struct VersionInfo {
pub(crate) struct Versions {
channel: String,
- rustc_version: String,
dist_path: PathBuf,
versions: HashMap<PkgType, VersionInfo>,
}
impl Versions {
- pub(crate) fn new(channel: &str, rustc_version: &str, dist_path: &Path) -> Result<Self, Error> {
- Ok(Self {
- channel: channel.into(),
- rustc_version: rustc_version.into(),
- dist_path: dist_path.into(),
- versions: HashMap::new(),
- })
+ pub(crate) fn new(channel: &str, dist_path: &Path) -> Result<Self, Error> {
+ Ok(Self { channel: channel.into(), dist_path: dist_path.into(), versions: HashMap::new() })
}
pub(crate) fn channel(&self) -> &str {
@@ -177,10 +172,10 @@ impl Versions {
) -> Result<String, Error> {
let component_name = package.tarball_component_name();
let version = match self.channel.as_str() {
- "stable" => self.rustc_version.clone(),
+ "stable" => RUSTC_VERSION.into(),
"beta" => "beta".into(),
"nightly" => "nightly".into(),
- _ => format!("{}-dev", self.rustc_version),
+ _ => format!("{}-dev", RUSTC_VERSION),
};
if package.target_independent() {
@@ -191,6 +186,6 @@ impl Versions {
}
pub(crate) fn rustc_version(&self) -> &str {
- &self.rustc_version
+ RUSTC_VERSION
}
}