nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-24 04:46:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-manifest: strip newline from rustc version

Browse Source
This commit is contained in:
Pietro Albini 2020-11-16 14:36:49 +01:00
parent 1bac1b40c8
commit e881b4e26c
No known key found for this signature in database
GPG Key ID: 3E06ABE80BAAF19C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/build-manifest/src/versions.rs
View File

@ -7,7 +7,6 @@ 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 {
@ -177,10 +176,10 @@ impl Versions {
) -> Result<String, Error> {
let component_name = package.tarball_component_name();
let version = match self.channel.as_str() {
"stable" => RUSTC_VERSION.into(),
"stable" => self.rustc_version().into(),
"beta" => "beta".into(),
"nightly" => "nightly".into(),
_ => format!("{}-dev", RUSTC_VERSION),
_ => format!("{}-dev", self.rustc_version()),
};
if package.target_independent() {
@ -199,6 +198,7 @@ impl Versions {
}
pub(crate) fn rustc_version(&self) -> &str {
RUSTC_VERSION
const RUSTC_VERSION: &str = include_str!("../../../version");
RUSTC_VERSION.trim()
}
}