Remove in-tree flate/getopts crates by alexcrichton · Pull Request #42664 · rust-lang/rust

alexcrichton · 2017-06-14T22:34:12Z

Remove src/libflate in favor of flate2 on crates.io and src/libgetopts in favor of getopts on crates.io. The replacements have slightly different APIs and the usage in the compiler has been updated to reflect this.

This uncovered an unfortunate limitation of the compiler today to deal with linking everything correctly, and the workaround can be found documented in src/librustc/Cargo.toml.

rust-highfive · 2017-06-14T22:34:16Z

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2017-06-14T22:44:12Z

We can also remove miniz.c from the COPYRIGHT file, I think.

aidanhs · 2017-06-15T00:23:44Z

Travis failed:

[00:49:58] make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
[00:49:58] error[E0464]: multiple matching crates for `libc`
[00:49:58] --> foo.rs:15:1
[00:49:58] |
[00:49:58] 15 | extern crate libc;
[00:49:58] | ^^^^^^^^^^^^^^^^^^
[00:49:58] |
[00:49:58] = note: candidates:
[00:49:58] = note: path: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-6545a7b8b89ca177.rlib
[00:49:58] = note: crate name: libc
[00:49:58] = note: path: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-6ecacccb5bdc4911.rlib
[00:49:58] = note: crate name: libc
[00:49:58] [00:49:58] error[E0463]: can't find crate for `libc`
[00:49:58] --> foo.rs:15:1
[00:49:58] |
[00:49:58] 15 | extern crate libc;
[00:49:58] | ^^^^^^^^^^^^^^^^^^ can't find crate
[00:49:58] [00:49:58] error: aborting due to previous error(s)
[00:49:58] [00:49:58] make[1]: *** [all] Error 101

alexcrichton · 2017-06-15T02:27:16Z

Should be updated now

bors · 2017-06-16T14:43:07Z

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

alexcrichton · 2017-06-16T15:01:57Z

Rebased

eddyb · 2017-06-16T15:55:21Z

@bors r+

bors · 2017-06-16T15:55:22Z

📌 Commit 9881c23 has been approved by eddyb

bors · 2017-06-17T13:32:25Z

⌛ Testing commit 9881c23 with merge 21bb1c7...

bors · 2017-06-17T13:42:12Z

💔 Test failed - status-travis

Mark-Simulacrum · 2017-06-17T13:43:47Z

I think we might be trying to put one of these crates into the rust-src component.

[00:02:43] thread 'main' panicked at 'fs::read_dir(src) failed with No such file or directory (os error 2)', /checkout/src/bootstrap/util.rs:82

alexcrichton · 2017-06-17T18:50:54Z

@bors: r=eddyb

bors · 2017-06-17T18:50:55Z

📌 Commit f53f838 has been approved by eddyb

bors · 2017-06-18T19:45:43Z

⌛ Testing commit f53f8387ae21bd786194927d1ba9ace1e14855e9 with merge 864ee9a733032b38db6755cb511b7733556b88fd...

bors · 2017-06-18T21:10:30Z

💔 Test failed - status-appveyor

bors · 2017-06-18T23:24:20Z

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

bors · 2017-06-20T15:16:27Z

📌 Commit 2218774 has been approved by eddyb

bors · 2017-06-20T19:00:22Z

⌛ Testing commit 22187747ac777ec7e6554bc0a421560bc5e22495 with merge 67aeea3f6f38497f18bcb11e08166f82a5f7b778...

bors · 2017-06-20T19:34:32Z

💔 Test failed - status-appveyor

kennytm · 2017-06-20T19:39:57Z

error: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, and unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead? (see issue #27812)
--> src\tools\compiletest\src\main.rs:21:1
|
21 | extern crate getopts;
| ^^^^^^^^^^^^^^^^^^^^^
|
= help: add #![feature(rustc_private)] to the crate attributes to enable

This commit deletes the in-tree `getopts` crate in favor of the crates.io-based `getopts` crate. The main difference here is with a new builder-style API, but otherwise everything else remains relatively standard.

alexcrichton · 2017-06-20T19:43:27Z

@bors: r=eddyb

bors · 2017-06-20T19:44:27Z

📌 Commit 5c3d0e6 has been approved by eddyb

bors · 2017-06-21T06:27:42Z

⌛ Testing commit 5c3d0e6 with merge 37a991a...

Remove in-tree flate/getopts crates Remove `src/libflate` in favor of `flate2` on crates.io and `src/libgetopts` in favor of `getopts` on crates.io. The replacements have slightly different APIs and the usage in the compiler has been updated to reflect this. This uncovered an unfortunate limitation of the compiler today to deal with linking everything correctly, and the workaround can be found documented in `src/librustc/Cargo.toml`.

bors · 2017-06-21T08:44:29Z

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing 37a991a to master...

oyvindln · 2017-06-22T22:53:37Z

A bit late here, maybe I should have made an issue. Is using the "Default" compression level intended? the flate functions were changed to use a faster compression level some time ago (see #37298), going back to a higher compression setting may cause some performance regressions.

Also, the old functions didn't use a zlib wrapper from what I can see, but the new code seems to. Don't know if this could cause some issues when trying to use libs from different versions, though at least it adds 6 bytes of overhead due to the header and checksum.

Mark-Simulacrum · 2017-06-22T23:52:19Z

I'd file a new issue with those concerns (they seem good to address to me) since merged/closed PRs are low-visibility locations.

This was attempted but left incomplete in PR rust-lang#42664, where only the toml file was removed.

@alexcrichton

…lexcrichton Remove getopts leftover from tree This was attempted but left incomplete in PR rust-lang#42664, where only the toml file was removed. cc @alexcrichton

@alexcrichton

…lexcrichton Remove getopts leftover from tree This was attempted but left incomplete in PR rust-lang#42664, where only the toml file was removed. cc @alexcrichton

@alexcrichton

…lexcrichton Remove getopts leftover from tree This was attempted but left incomplete in PR rust-lang#42664, where only the toml file was removed. cc @alexcrichton

rust-highfive assigned eddyb Jun 14, 2017

aidanhs added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 15, 2017

alexcrichton force-pushed the moar-crates branch from 0ac4b5e to 840c430Compare June 15, 2017 02:26

alexcrichton force-pushed the moar-crates branch from 840c430 to 78f2602Compare June 15, 2017 02:32

Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 15, 2017

alexcrichton force-pushed the moar-crates branch from 78f2602 to c55b1c5Compare June 15, 2017 14:08

alexcrichton force-pushed the moar-crates branch from c55b1c5 to 9881c23Compare June 16, 2017 15:01

frewsxcv 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 17, 2017

alexcrichton force-pushed the moar-crates branch from 9881c23 to f53f838Compare June 17, 2017 18:50

alexcrichton force-pushed the moar-crates branch from f53f838 to 5488132Compare June 19, 2017 14:23

bors mentioned this pull request Jun 20, 2017
mark calls in the unwind path as !noinline #42771
Merged

Switch to the crates.io getopts crate
5c3d0e6
This commit deletes the in-tree `getopts` crate in favor of the crates.io-based `getopts` crate. The main difference here is with a new builder-style API, but otherwise everything else remains relatively standard.

alexcrichton force-pushed the moar-crates branch from 2218774 to 5c3d0e6Compare June 20, 2017 19:43

arielb1 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 Jun 20, 2017

bors mentioned this pull request Jun 21, 2017
Support compiling rustc without LLVM #42752
Closed
2 tasks

bors merged commit 5c3d0e6 into rust-lang:masterJun 21, 2017

This was referenced Jun 21, 2017
Integrate jobserver support to parallel codegen #42682
Merged
Add ‘#[serial]’ tests (v2) #42684
Closed
rustc: Implement the #[global_allocator] attribute #42727
Merged

oyvindln mentioned this pull request Jun 24, 2017
Deflate settings changed when replacing in-tree flate with flate2 #42879
Closed

alexcrichton deleted the moar-crates branch June 24, 2017 17:26

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 23, 2018
Remove getopts leftover from tree
700fd5a
This was attempted but left incomplete in PR rust-lang#42664, where only the toml file was removed.

Mark-Simulacrum mentioned this pull request Mar 23, 2018
Remove getopts leftover from tree #49314
Merged

Uh oh!

Uh oh!

Conversation

alexcrichton commented Jun 14, 2017

Uh oh!

rust-highfive commented Jun 14, 2017

Uh oh!

Mark-Simulacrum commented Jun 14, 2017

Uh oh!

aidanhs commented Jun 15, 2017

Uh oh!

alexcrichton commented Jun 15, 2017

Uh oh!

bors commented Jun 16, 2017

Uh oh!

alexcrichton commented Jun 16, 2017

Uh oh!

eddyb commented Jun 16, 2017

Uh oh!

bors commented Jun 16, 2017

Uh oh!

bors commented Jun 17, 2017

Uh oh!

bors commented Jun 17, 2017

Uh oh!

Mark-Simulacrum commented Jun 17, 2017

Uh oh!

alexcrichton commented Jun 17, 2017

Uh oh!

bors commented Jun 17, 2017

Uh oh!

bors commented Jun 18, 2017

Uh oh!

bors commented Jun 18, 2017

Uh oh!

bors commented Jun 18, 2017

Uh oh!

bors commented Jun 20, 2017

Uh oh!

bors commented Jun 20, 2017

Uh oh!

bors commented Jun 20, 2017

Uh oh!

kennytm commented Jun 20, 2017

Uh oh!

alexcrichton commented Jun 20, 2017

Uh oh!

bors commented Jun 20, 2017

Uh oh!

bors commented Jun 21, 2017

Uh oh!

bors commented Jun 21, 2017

Uh oh!

oyvindln commented Jun 22, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mark-Simulacrum commented Jun 22, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

oyvindln commented Jun 22, 2017•
edited
Loading