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

Rollup of 8 pull requests #41585

Closed
wants to merge 18 commits into from
Closed

Rollup of 8 pull requests #41585

wants to merge 18 commits into from

Conversation

estebank and others added 18 commits April 25, 2017 22:03
Build them directly in the `./x.py build` phase, don't wait for
`./x.py dist`

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This way its files take precedence (e.g. README.md and stuff)

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
`try_index_step` does not resolve type variables by itself and would
fail otherwise. Also harden the failure path in `confirm` to cause less
confusing errors.
Adding links and examples for various mspc pages rust-lang#29377

Adding links and copying examples for the various Iterators; adding some extra stuff to `Sender`/`SyncSender`/`Receiver`.
query for describe_def

Resolves `fn describe_def(&self, def: DefId) -> Option<Def>;` of rust-lang#41417.

r? @nikomatsakis I would greatly appreciate a review. I hope I covered everything described in the pr.
rustbuild improvements

Properly hook up cargo and rls in the build phase, and install them, when extended build is enabled.
typeck: resolve type vars before calling `try_index_step`

`try_index_step` does not resolve type variables by itself and would
fail otherwise. Also harden the failure path in `confirm` to cause less
confusing errors.

r? @eddyb

Fixes rust-lang#41498.

beta-nominating because regression (caused by rust-lang#41279).
don't ICE on cross-crate associated const type mismatch

Fixes rust-lang#41549.

r? @eddyb
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @sfackler (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.

@frewsxcv
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Apr 27, 2017

📌 Commit f62bc63 has been approved by frewsxcv

@alexcrichton alexcrichton added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 27, 2017
@bors
Copy link
Contributor

bors commented Apr 27, 2017

⌛ Testing commit f62bc63 with merge 5b2f043...

@bors
Copy link
Contributor

bors commented Apr 27, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

I believe that was caused by #41577

@frewsxcv frewsxcv closed this Apr 27, 2017
@frewsxcv frewsxcv deleted the rollup branch April 27, 2017 22:01
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.