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

Phase 1 of stdlib dependencies (RFC #1133) #2768

Closed
wants to merge 12 commits into from

Conversation

Ericson2314
Copy link
Contributor

@Ericson2314 Ericson2314 commented Jun 4, 2016

This is the first implementation as specified by the RFC. It should contain:

  • compiler sysroot
  • explicit stdlib deps, with proper restrictions on their use
  • implicit stdlib deps
  • temp workaround keep-stdlib-dependencies key
  • temp workaround custom-implicit-stdlib-dependencies key

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@Ericson2314
Copy link
Contributor Author

Ok, routed some config items for actually using this thing. Still need to write tests on the actual functionality, not just parsing----or test manually though if I can do the former I rather not bother. But, if it works, it's pretty close to done beyond bike-shedding config key names, etc.

Some(reference) => {
let config = try!(config.get_string("stdlib-repo"));
let url = config.as_ref().map(|s| &s.val[..])
.unwrap_or("http://github.com/rust-lang/rust.git");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR rust-lang-deprecated/rust-buildbot#102 should allow to avoid using git repository here, which is slow.

Copy link
Contributor Author

@Ericson2314 Ericson2314 Jun 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is slow (though it's a lot faster when I use the git cli to download myself). What is this manifest though? I don't use rustup.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, I thought that this manifest specifies the things uploaded to https://static.rust-lang.org, but looks like rust sources are already there. Perhaps downloading .tar.gz from static.rust-lang.org would be faster? Or is it significantly more code to write?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the actual URL? (I hate how hard it is to browse https://static.rust-lang.org.) If the nightly repos are up by date, but rustc -vV only gives us the commit hash (both those statements might be false :)), this will be a lot harder.

I'm generally interested in fixing the perf problem with Cargo, but at this point I just want to see explicit stdlib deps in some form and am not too picky :).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the url should be https://static.rust-lang.org/dist/$date/rustc-nightly-src.tar.gz. rustc -vV includes date:

rustc 1.9.0 (e4e8b6668 2016-05-18)Not sure about beta though. 

binary: rustc
commit-hash: e4e8b666850a763fdf1c3c2c142856ab51e32779
commit-date: 2016-05-18
host: x86_64-unknown-linux-gnu
release: 1.9.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that's good!

@bors
Copy link
Collaborator

bors commented Jun 12, 2016

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

@Ericson2314 Ericson2314 force-pushed the stdlib-deps branch 7 times, most recently from d6d0617 to 2f97f22 Compare August 29, 2016 21:57
@Ericson2314 Ericson2314 changed the title [WIP] Implement stdlib dependencies (RFC #1133) [WIP] Phase 1 of stdlib dependencies (RFC #1133) Aug 31, 2016
@Ericson2314 Ericson2314 force-pushed the stdlib-deps branch 6 times, most recently from 159ee77 to 1c234c4 Compare September 1, 2016 22:09
@Ericson2314 Ericson2314 changed the title [WIP] Phase 1 of stdlib dependencies (RFC #1133) Phase 1 of stdlib dependencies (RFC #1133) Sep 1, 2016
@bors
Copy link
Collaborator

bors commented Sep 6, 2016

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

@Ericson2314
Copy link
Contributor Author

(Because I have less time with work, I've enabled maintainer access to this branch.)

The location of the compiler source can be overwritten, but ca
@Ericson2314
Copy link
Contributor Author

Rebased

@bors
Copy link
Collaborator

bors commented Nov 3, 2016

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

@cardoe
Copy link
Contributor

cardoe commented Dec 4, 2016

@alexcrichton Since you're the assignee here do you have any feedback on this PR? If it looks like this approach will work going forward I'll gladly take it over and get it landed since @Ericson2314 is unable to work on it further.

@alexcrichton
Copy link
Member

@cardoe this is currently blocked on rust-lang/rfcs#1133, unfortunately

@Ericson2314
Copy link
Contributor Author

Ericson2314 commented Dec 5, 2016

@cardoe yeah I haven't abandoned this or the RFC, but have been waiting for the RFC to arrive at the front of the queue.

@alexcrichton
Copy link
Member

I'm going to close this due to inactivity, in favor of the open RFC.

@Ericson2314
Copy link
Contributor Author

https://github.com/cardoe/cargo/commits/stdlib-deps is a rebase (Thanks @cardoe!) that I should link here lest it be lost to posterity.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants