{compiler-builtins,libc} shim cleanup #44515

tamird · 2017-09-12T01:21:51Z

~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton

tamird · 2017-09-12T01:30:46Z

Hm, seems like I should amend the new comments to reference rust-lang/rfcs#1133. WDYT?

alexcrichton · 2017-09-12T01:55:38Z

Using cargo features sounds fine to me!

tamird · 2017-09-12T01:56:53Z

Sounds find to me too! But it doesn't quite work out, which this PR is really about documenting at this point

tamird · 2017-09-12T20:09:14Z

Alright, this is ready for a real look!

alexcrichton · 2017-09-12T21:23:37Z

@bors: r+

bors · 2017-09-12T21:23:38Z

📌 Commit d10c760 has been approved by alexcrichton

bors · 2017-09-14T06:14:36Z

☔ The latest upstream changes (presumably #43972) made this pull request unmergeable. Please resolve the merge conflicts.

tamird · 2017-09-14T13:55:04Z

Rebased.

alexcrichton · 2017-09-14T17:29:44Z

@bors: r+

bors · 2017-09-14T17:29:45Z

📌 Commit 509982c has been approved by alexcrichton

shepmaster · 2017-09-15T17:53:41Z

[00:03:44] tidy error: /checkout/src/test/compile-fail/rmeta_lib.rs:13: line longer than 100 chars

tamird · 2017-09-15T18:06:18Z

@shepmaster did you mean to post that elsewhere? that file didn't change in this PR and I don't see that failure anywhere.

shepmaster · 2017-09-15T18:33:08Z

did you mean to post that elsewhere? that file didn't change in this PR and I don't see that failure anywhere.

It was in the CI run; but it appears someone has restarted it. Perhaps it's an unrelated thing that someone has already fixed...

alexcrichton · 2017-09-16T00:58:39Z

@bors: rollup

@alexcrichton

{compiler-builtins,libc} shim cleanup ~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton

@alexcrichton

{compiler-builtins,libc} shim cleanup ~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton

tamird · 2017-09-29T16:04:08Z

Haven't come back to this yet; will see about doing that today

…

On Sep 28, 2017 10:24, "Alex Crichton" ***@***.***> wrote: @tamird <https://github.com/tamird> do you have a windows machine to test this on locally with? Or any luck using appveyor to test this PR? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#44515 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABdsPJT222CGLCItfSjgvDWa33LLRBhdks5sm6w7gaJpZM4PT-Uu> .

tamird · 2017-10-01T18:48:42Z

@alexcrichton I edited appveyor.yml as you suggested, but how do I trigger single appveyor builds?

alexcrichton · 2017-10-04T09:28:46Z

@tamird you'll also need to enable appveyor for the auto branch

alexcrichton · 2017-10-06T19:47:24Z

Looking at the logs there, the fact that the build script is running is actually a bug I believe, maybe try setting RUST_LOG=cargo::ops::cargo_rustc::fingerprint=info to see why the build script is being rerun?

tamird · 2017-10-06T22:14:14Z

Thanks for the hint!

INFO:cargo::ops::cargo_rustc::fingerprint: stale: C:\projects\rust\src\rustc\compiler_builtins_shim\build.rs -- missing
INFO:cargo::ops::cargo_rustc::fingerprint: fingerprint error for compiler_builtins v0.0.0 (file:///C:/projects/rust/src/rustc/compiler_builtins_shim): mtime based components have changed: previously Some(FileTime { seconds: 13151797507, nanos: 852703300 }) now None, paths are "C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage1-std\\x86_64-pc-windows-gnu\\release\\build\\compiler_builtins-6a0431bf00803b6f\\output" and "C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage1-std\\x86_64-pc-windows-gnu\\release\\build\\compiler_builtins-6a0431bf00803b6f\\output"
INFO:cargo::ops::cargo_rustc::fingerprint:   cause: mtime based components have changed: previously Some(FileTime { seconds: 13151797507, nanos: 852703300 }) now None, paths are "C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage1-std\\x86_64-pc-windows-gnu\\release\\build\\compiler_builtins-6a0431bf00803b6f\\output" and "C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage1-std\\x86_64-pc-windows-gnu\\release\\build\\compiler_builtins-6a0431bf00803b6f\\output"

Not sure what to make of this, though. mtime is now None? Does that mean the file was removed?

alexcrichton · 2017-10-06T22:20:34Z

The bug I think is this line because with the presence of src/rustc/compiler-builtins-shim/build.rs it's say "rerun if that file changed" but that file's being deleted in this PR, so it's saying "rerun if this file that doesn't exist changed" which means it's always being rerun!

It's probably fine to just make build.rs an empty file with a comment as to why.

tamird · 2017-10-06T22:52:10Z

We could just remove that from upstream, right? The docs at http://doc.crates.io/build-script.html state:

Note that if the build script itself (or one of its dependencies) changes, then it's rebuilt and rerun unconditionally, so cargo:rerun-if-changed=build.rs is almost always redundant (unless you want to ignore changes in all other files except for build.rs).

alexcrichton · 2017-10-06T23:07:55Z

I commented on the associated PR, but to comment here as well, we want this directive when developing the compiler-builtins crate because only modifications to the build script should rerun the build script.

tamird · 2017-10-06T23:11:00Z

Yup, thanks for your help. Done!

alexcrichton · 2017-10-06T23:13:06Z

@bors: r+

Ok hopefully we're good to go now! Sort of a crazy coincidence this ever worked.

bors · 2017-10-06T23:13:07Z

📌 Commit 138d5ad has been approved by alexcrichton

bors · 2017-10-07T00:22:57Z

⌛ Testing commit 138d5add2688f2fa5a335c6a1c7ece83d35e82af with merge 62a870877060f4779e5618e5ff8c4aa05fe67667...

bors · 2017-10-07T00:28:39Z

💔 Test failed - status-appveyor

tamird · 2017-10-07T00:36:46Z

Urgh. Fixed the license.

…

On Fri, Oct 6, 2017 at 8:29 PM, bors ***@***.***> wrote: 💔 Test failed - status-appveyor <https://ci.appveyor.com/project/rust-lang/rust/build/1.0.4909> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#44515 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABdsPI4wB5HkEQ_-cFmCmaKAy1u3UjxUks5spsXOgaJpZM4PT-Uu> .

alexcrichton · 2017-10-07T02:40:17Z

@bors: r+

bors · 2017-10-07T02:40:18Z

📌 Commit 7d6c3da has been approved by alexcrichton

bors · 2017-10-07T05:32:55Z

⌛ Testing commit 7d6c3da with merge cce9343...

@alexcrichton

{compiler-builtins,libc} shim cleanup ~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton

bors · 2017-10-07T08:03:10Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing cce9343 to master...

@alexcrichton

cargo_rustc: remove workaround for fixed upstream issue Fixed in rust-lang/rust#25411. Also, the removed code is implicated in test failures observed in rust-lang/rust#44515. r? @alexcrichton

rust-highfive assigned alexcrichton Sep 12, 2017

tamird force-pushed the clean-shims branch from 95dbcd9 to 055a123 Compare September 12, 2017 01:24

tamird force-pushed the clean-shims branch from 055a123 to d10c760 Compare September 12, 2017 20:09

aidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 13, 2017

tamird force-pushed the clean-shims branch from d10c760 to 509982c Compare September 14, 2017 13:52

tamird mentioned this pull request Sep 15, 2017

Remove rustc_bitflags; use the bitflags crate #44441

Merged

shepmaster added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 15, 2017

shepmaster added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 15, 2017

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 16, 2017

Rollup merge of rust-lang#44515 - tamird:clean-shims, r=alexcrichton

91dc1d9

{compiler-builtins,libc} shim cleanup ~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton

alexcrichton mentioned this pull request Sep 16, 2017

Rollup of 27 pull requests #44621

Closed

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Sep 16, 2017

Rollup merge of rust-lang#44515 - tamird:clean-shims, r=alexcrichton

d658e4a

{compiler-builtins,libc} shim cleanup ~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton

frewsxcv mentioned this pull request Sep 16, 2017

Rollup of 25 pull requests #44623

Closed

tamird force-pushed the clean-shims branch from 83fdfbc to 74c82f5 Compare October 1, 2017 18:48

tamird force-pushed the clean-shims branch from 74c82f5 to 233ec75 Compare October 4, 2017 20:08

tamird mentioned this pull request Oct 5, 2017

cargo_rustc: remove workaround for fixed upstream issue rust-lang/cargo#4581

Merged

tamird force-pushed the clean-shims branch from 92c2712 to 4b3f528 Compare October 5, 2017 16:25

tamird force-pushed the clean-shims branch from be74a3d to 138d5ad Compare October 6, 2017 23:11

Trim and document compiler-builtins shim

7d6c3da

tamird force-pushed the clean-shims branch from 138d5ad to 7d6c3da Compare October 7, 2017 00:36

bors added a commit that referenced this pull request Oct 7, 2017

Auto merge of #44515 - tamird:clean-shims, r=alexcrichton

cce9343

{compiler-builtins,libc} shim cleanup ~~Depends on rust-lang/libc#764; opening early for feedback.~~ r? @alexcrichton

bors merged commit 7d6c3da into rust-lang:master Oct 7, 2017

tamird deleted the clean-shims branch October 7, 2017 08:22

{compiler-builtins,libc} shim cleanup #44515

{compiler-builtins,libc} shim cleanup #44515

Uh oh!

Conversation

tamird commented Sep 12, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tamird commented Sep 12, 2017

Uh oh!

alexcrichton commented Sep 12, 2017

Uh oh!

tamird commented Sep 12, 2017

Uh oh!

tamird commented Sep 12, 2017

Uh oh!

alexcrichton commented Sep 12, 2017

Uh oh!

bors commented Sep 12, 2017

Uh oh!

bors commented Sep 14, 2017

Uh oh!

tamird commented Sep 14, 2017

Uh oh!

alexcrichton commented Sep 14, 2017

Uh oh!

bors commented Sep 14, 2017

Uh oh!

shepmaster commented Sep 15, 2017

Uh oh!

tamird commented Sep 15, 2017

Uh oh!

shepmaster commented Sep 15, 2017

Uh oh!

alexcrichton commented Sep 16, 2017

Uh oh!

tamird commented Sep 29, 2017 via email

Uh oh!

tamird commented Oct 1, 2017

Uh oh!

alexcrichton commented Oct 4, 2017

Uh oh!

alexcrichton commented Oct 6, 2017

Uh oh!

tamird commented Oct 6, 2017

Uh oh!

alexcrichton commented Oct 6, 2017

Uh oh!

tamird commented Oct 6, 2017

Uh oh!

alexcrichton commented Oct 6, 2017

Uh oh!

tamird commented Oct 6, 2017

Uh oh!

alexcrichton commented Oct 6, 2017

Uh oh!

bors commented Oct 6, 2017

Uh oh!

bors commented Oct 7, 2017

Uh oh!

bors commented Oct 7, 2017

Uh oh!

tamird commented Oct 7, 2017 via email

Uh oh!

alexcrichton commented Oct 7, 2017

Uh oh!

bors commented Oct 7, 2017

Uh oh!

bors commented Oct 7, 2017

Uh oh!

bors commented Oct 7, 2017

Uh oh!

Uh oh!

tamird commented Sep 12, 2017 •

edited

Loading