user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #59544 - cuviper:miri-nightly, r=Centril

Browse source 
manifest: only include miri on the nightly channel

miri needs to build std with xargo, which doesn't allow stable/beta:
<https://github.com/japaric/xargo/pull/204#issuecomment-374888868>

Therefore, at this time there's no point in making miri available on any
but the nightly channel.  If we get a stable way to build `std`, like
[RFC 2663], then we can re-evaluate whether to start including miri,
perhaps still as `miri-preview`.

[RFC 2663]: https://github.com/rust-lang/rfcs/pull/2663
This commit is contained in:
Mazdak Farrokhzad 2019-03-30 14:14:58 +01:00 • committed by GitHub
commit 04ffaca71a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -523,12 +523,18 @@ impl Builder {
pkgname: &str,
dst: &mut BTreeMap<String, Package>,
targets: &[&str]) {
let (version, is_present) = self.cached_version(pkgname)
let (version, mut is_present) = self.cached_version(pkgname)
.as_ref()
.cloned()
.map(|version| (version, true))
.unwrap_or_default();
// miri needs to build std with xargo, which doesn't allow stable/beta:
// <https://github.com/japaric/xargo/pull/204#issuecomment-374888868>
if pkgname == "miri-preview" && self.rust_release != "nightly" {
is_present = false; // ignore it
}
let targets = targets.iter().map(|name| {
if is_present {
let filename = self.filename(pkgname, name);