Fix for latest nightly: need to add a patch section #228

RalfJung · 2018-12-13T19:19:26Z

Fixes #227

…kspace-core

jethrogb · 2018-12-14T11:24:50Z

I just filed #229 myself, I guess I should've looked through the PRs first :P

Anyway, you should update your PR to say "Fixes #227"

jethrogb · 2018-12-14T11:34:10Z

Anyway, this (and #229) don't work (fully). It works if you're using only the rust-src component or XARGO_RUST_SRC. However, if you're specifying the source in Xargo.toml, the dependency on rustc-std-workspace-core will point to the wrong libcore source.

I've come up with 3 different approaches to fix this, not sure which one is best:

If there is a std crate in the blueprint, compute ../tools/rustc-std-workspace-core from that path (or use the same git) and use that as the [patch].
If there is a std crate in the blueprint, find the spec of the core dependency, then generate a rustc-std-workspace-core crate in the tempdir with that core (how would this work if std is a git dependency?). Then, use that temp crate as the [patch].
Use the logic in this PR or Fix build for latest Rust nightly source #229 to generate the [patch] by default. Let users specify their own [patch]es in Xargo.toml

RalfJung · 2018-12-14T12:03:14Z

I don't have a strong opinion about solving this problem.

However, I think we can merge one of #228 and #229 to fix the immediate problem for everyone using an unchanged libstd/XARGO_RUST_SRC, and then separately have an issue for fixing the other case?

jethrogb · 2018-12-14T12:35:43Z

I think this PR doesn't work for compiling core without Xargo.toml so I'd vote #229

RalfJung · 2018-12-14T13:39:27Z

I think this PR doesn't work for compiling core without Xargo.toml so I'd vote

Not sure hat you mean by that, but fine for me.

However, please make sure xargo still works for old libstd that does not have rustc-std-workspace-core yet.

RalfJung · 2018-12-14T13:40:07Z

Also I did the proper thing for fixing the deprecation warnings instead of just silencing them, feel free to copy those parts of my patches.

jethrogb · 2018-12-14T18:25:45Z

However, please make sure xargo still works for old libstd that does not have rustc-std-workspace-core yet.

When building std from a git source, how will you know whether to add the patch or not?

RalfJung · 2018-12-15T09:41:32Z

Can't you check whether the rustc-std-workspace-core folder exists? That's what this patch does.

jethrogb · 2018-12-15T11:34:41Z

How would that work for a git source? Xargo doesn't have access to the source.

RalfJung · 2018-12-15T12:06:25Z

I'm afraid I am not familiar with the mode of operation of xargo you are referring to. I have only ever used xargo with the rust-src component, and I think it is reasonable to keep xargo compatible with older Rust nightlies -- it's not much effort.

japaric · 2018-12-15T15:16:29Z

Thanks for the PRs, @RalfJung and @jethrogb! I'm going to land this one since it works with older nightly releases. On that note: @RalfJung, could you add a new builder that runs the test suite on an older nightly? I think the change should boil down to adding these lines to .travis.yml:

matrix:
  include:
    - env: TARGET=x86_64-unknown-linux-gnu
      rust: nightly-2018-12-XX

Feel free to land this with that change.

bors delegate+

bors · 2018-12-15T15:16:30Z

✌️ RalfJung can now approve this pull request

RalfJung · 2018-12-15T15:21:32Z

@japaric there was no CI in this PR at all though, for some reason?

japaric · 2018-12-15T15:25:55Z

@RalfJung CI builds on PRs was disabled; I have re-enabled it.

RalfJung · 2018-12-15T15:27:25Z

@japaric Hm, still not doing anything.

japaric · 2018-12-15T15:33:20Z

Hmm, I think you'll have to add master to the list of branches in .travis.yml.

I'll kick off a try build for now.

bors try

japaric · 2018-12-15T15:33:50Z

Link to try build: https://travis-ci.org/japaric/xargo/builds/468425445

bors · 2018-12-15T15:37:40Z

try

Build failed

continuous-integration/travis-ci/push

RalfJung · 2018-12-15T15:46:28Z

Looks like CI is not in a good state...

E: Unable to locate package gcc-arm-none-eabi

RalfJung · 2018-12-15T15:51:35Z

ci/script.sh does nothing if the branch is "master"... seems like this is not intended to work for PRs. Odd.

bors try

RalfJung · 2018-12-15T16:06:11Z

bors try

RalfJung · 2018-12-15T16:13:18Z

Why is it not listening now?^^

bors try

bors · 2018-12-15T16:13:19Z

try

Not awaiting review

RalfJung · 2018-12-15T16:13:44Z

Oh it did listen, just GH didn't update. Never mind.

RalfJung · 2018-12-15T16:14:40Z

Well that looks really green to me!

bors r+

228: Fix for latest nightly: need to add a patch section r=RalfJung a=RalfJung Fixes #227 Co-authored-by: Ralf Jung <[email protected]>

bors · 2018-12-15T16:15:28Z

try

Build failed

continuous-integration/travis-ci/push

RalfJung · 2018-12-15T16:15:37Z

Uh, no, just the nightly-XXX didn't run the tests because it's not exactly "nightly".

bors r-

bors · 2018-12-15T16:15:38Z

Canceled

RalfJung · 2018-12-15T16:26:48Z

bors try

bors · 2018-12-15T16:32:54Z

try

Build succeeded

continuous-integration/travis-ci/push

RalfJung · 2018-12-15T16:40:38Z

bors try

bors · 2018-12-15T16:51:53Z

try

Build succeeded

continuous-integration/travis-ci/push

RalfJung · 2018-12-15T16:57:21Z

Okay, now it actually tested something and the tests come back green. :)

RalfJung · 2018-12-15T16:57:45Z

bors r+

228: Fix for latest nightly: need to add a patch section r=RalfJung a=RalfJung Fixes #227 Co-authored-by: Ralf Jung <[email protected]>

bors · 2018-12-15T17:09:18Z

Build succeeded

continuous-integration/travis-ci/push

thepowersgang · 2018-12-16T02:59:42Z

When would we expect to see this change in a released version on crates.io?

jethrogb · 2018-12-16T05:23:14Z

I've filed #230 and #231 for the remaining issues.

RalfJung added 3 commits December 13, 2018 19:52

cargo update and make it build again

21af9c3

fix tests

bf94258

fix for latest nightly: need to add a patch section for rustc-std-wor…

b004f1c

…kspace-core

RalfJung mentioned this pull request Dec 13, 2018

fix for latest nightly rust-lang/miri#574

Merged

compatibility with old rust-src packages

48236dd

HadrienG2 mentioned this pull request Dec 14, 2018

Compiler builtins should now be downloaded from crates.io rust-osdev/cargo-xbuild#22

Closed

vi mentioned this pull request Dec 15, 2018

Allow asserts and panics to abort process quietly. rust-lang/rust#54981

Closed

test against older nightly as well

9461fcd

bors bot added a commit that referenced this pull request Dec 15, 2018

Try #228:

980bd8d

bors bot added a commit that referenced this pull request Dec 15, 2018

Try #228:

75fdb4f

bors bot added a commit that referenced this pull request Dec 15, 2018

Try #228:

d1d37b6

bors bot added a commit that referenced this pull request Dec 15, 2018

Merge #228

ce75eec

228: Fix for latest nightly: need to add a patch section r=RalfJung a=RalfJung Fixes #227 Co-authored-by: Ralf Jung <[email protected]>

RalfJung added 2 commits December 15, 2018 17:16

run tests on all nightlies

b339557

don't assume everything is in the sysroot

d12aedd

bors bot added a commit that referenced this pull request Dec 15, 2018

Try #228:

5349f40

typo in nightly detection

00f4dec

bors bot added a commit that referenced this pull request Dec 15, 2018

Try #228:

ae08d58

bors bot added a commit that referenced this pull request Dec 15, 2018

Merge #228

5aae0d9

228: Fix for latest nightly: need to add a patch section r=RalfJung a=RalfJung Fixes #227 Co-authored-by: Ralf Jung <[email protected]>

bors bot merged commit 00f4dec into japaric:master Dec 15, 2018

RalfJung mentioned this pull request Dec 15, 2018

Fix build for latest Rust nightly source #229

Closed

This was referenced Dec 16, 2018

No way to override crates in [patch] section #230

Open

Can't build using git sources based on latest Rust master #231

Open

johnthagen mentioned this pull request Dec 17, 2018

Release 0.3.13 #233

Closed

Fix for latest nightly: need to add a patch section #228

Fix for latest nightly: need to add a patch section #228

Conversation

RalfJung commented Dec 13, 2018 • edited Loading

jethrogb commented Dec 14, 2018 • edited Loading

jethrogb commented Dec 14, 2018

RalfJung commented Dec 14, 2018

jethrogb commented Dec 14, 2018

RalfJung commented Dec 14, 2018

RalfJung commented Dec 14, 2018

jethrogb commented Dec 14, 2018

RalfJung commented Dec 15, 2018

jethrogb commented Dec 15, 2018

RalfJung commented Dec 15, 2018

japaric commented Dec 15, 2018

bors bot commented Dec 15, 2018

RalfJung commented Dec 15, 2018

japaric commented Dec 15, 2018

RalfJung commented Dec 15, 2018

japaric commented Dec 15, 2018

japaric commented Dec 15, 2018

bors bot commented Dec 15, 2018

try

Build failed

RalfJung commented Dec 15, 2018

RalfJung commented Dec 15, 2018

RalfJung commented Dec 15, 2018

RalfJung commented Dec 15, 2018

bors bot commented Dec 15, 2018

try

RalfJung commented Dec 15, 2018

RalfJung commented Dec 15, 2018

bors bot commented Dec 15, 2018

try

Build failed

RalfJung commented Dec 15, 2018

bors bot commented Dec 15, 2018

Canceled

RalfJung commented Dec 15, 2018

bors bot commented Dec 15, 2018

try

Build succeeded

RalfJung commented Dec 15, 2018

bors bot commented Dec 15, 2018

try

Build succeeded

RalfJung commented Dec 15, 2018

RalfJung commented Dec 15, 2018

bors bot commented Dec 15, 2018

Build succeeded

thepowersgang commented Dec 16, 2018

jethrogb commented Dec 16, 2018

RalfJung commented Dec 13, 2018 •

edited

Loading

jethrogb commented Dec 14, 2018 •

edited

Loading