Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stop using custom rustc/cargo #243

Merged
merged 5 commits into from Oct 20, 2018
Merged

Conversation

@QuietMisdreavus
Copy link
Member

QuietMisdreavus commented Oct 17, 2018

This PR was a long time coming, and took some effort to coordinate and put together. Huge thanks to @jonhoo for setting up a dev environment that i could use to test this out!

This PR does a handful of things, namely:

  • Switch the cargo dependency from onur's fork to upstream.
    • This caused a lot of fallout in the code, since onur's fork was based on an old version of cargo.
    • This also forced several unrelated dependencies to update, since they depended on different versions of openssl-sys or libgit2, which caused Cargo to reject the lockfile.
    • However, this also allows crates to set editions and generally treat cargo as if it were nightly. (We'll need to manually update the lockfile to update cargo, though, including updating our use of it should the API change. Consider it a future task to switch to shelling out to cargo itself.)
  • Switch the internal error type from an error-chain enum to failure's Error type.
    • This was semi-required by the Cargo update, since it had switched to failure itself and its error type no longer worked as a foreign link in error-chain.
  • Set --extern-html-root-url in the rustdoc flags when building documentation for a crate.
    • This allows us to switch from onur's custom rustdoc fork to nightly rustdoc, allowing lots and lots of crates to start building and making compiler updates much easier in the future.

Sorry for totally obliterating the lockfile - it was easiest for me to make it totally regenerate it as part of the cargo upgrade. Without regenerating the lockfile, i was getting odd errors compiling seemingly unrelated dependencies.

This probably fixes so many posted issues here, but i haven't looked through them all. >_>

needed because cargo's CargoError is a re-export of failure's Error, and
doesn't work with error-chain
since we're technically using a "dev" version of cargo, nightly features
won't be available unless we force them on
@jonhoo

This comment has been minimized.

Copy link
Contributor

jonhoo commented Oct 17, 2018

Awesome work! For those who are curious, this new version runs on http://docsrs.csail.mit.edu/. Old crates haven't been built there yet, but new ones should be!

@QuietMisdreavus

This comment has been minimized.

Copy link
Member Author

QuietMisdreavus commented Oct 17, 2018

@onur Should i update the Vagrantfile in this PR to reflect the rustc in use on the development server? Since this PR fully supports a recent nightly rustc/rustdoc, we can update the development configuration to reflect the supported compiler version. (Though i understand that updating docs.rs itself will have to happen on the server, not just in the Vagrantfile.)

@onur onur merged commit ccac550 into rust-lang:master Oct 20, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@QuietMisdreavus QuietMisdreavus deleted the QuietMisdreavus:despecialize branch Oct 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.