bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #40111 - alexcrichton:fix-manifests, r=brson

Browse source 
Attempt to fix nightly manifests

Found a few bugs and mistakes with the manifests.

Closes #40106
This commit is contained in:
bors 2017-02-26 12:58:08 +00:00
commit 72e6d40f81
1 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/tools/build-manifest/src/main.rs
View file

@ -215,8 +215,8 @@ impl Builder {
self.package("rust-docs", &mut manifest.pkg, TARGETS);
self.package("rust-src", &mut manifest.pkg, &["*"]);
if self.channel == "rust-nightly" {
self.package("analysis", &mut manifest.pkg, TARGETS);
if self.channel == "nightly" {
self.package("rust-analysis", &mut manifest.pkg, TARGETS);
}
let mut pkg = Package {
@ -283,7 +283,7 @@ impl Builder {
pkg.target.insert(host.to_string(), Target {
available: true,
url: Some(self.url("rust", host)),
hash: Some(to_hex(digest.as_ref())),
hash: Some(digest),
components: Some(components),
extensions: Some(extensions),
});
@ -409,19 +409,3 @@ impl Builder {
self.sign(&dst);
}
}
fn to_hex(digest: &[u8]) -> String {
let mut ret = String::new();
for byte in digest {
ret.push(hex((byte & 0xf0) >> 4));
ret.push(hex(byte & 0xf));
}
return ret;
fn hex(b: u8) -> char {
match b {
0...9 => (b'0' + b) as char,
_ => (b'a' + b - 10) as char,
}
}
}