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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #42605

Merged
merged 8 commits into from
Jun 12, 2017
Merged

Rollup of 4 pull requests #42605

merged 8 commits into from
Jun 12, 2017

Conversation

frewsxcv
Copy link
Member

maccoda and others added 8 commits June 10, 2017 16:19
@maccoda
env docs completion.
f52ac18
@ideasman42
Add missing term 'disjoint' from matches, rmatches
11ee1b0 
This follows `match_indices`
@ollie27
rustdoc: Link directly to associated types
429dc51 
Rather than just linking to the trait.

Also simplifies the logic used to decide whether to render the full
QPath.
@ollie27
rustdoc: Stop stripping empty modules
7298dab 
There is no good reason to strip empty modules with no documentation and
doing so causes subtle problems.
@frewsxcv
Rollup merge of rust-lang#42579 - maccoda:maccoda/env_docs, r=stevekl…
3a550a4 
…abnik

env docs completion.

Should be closing rust-lang#29351 with the alignment of the iterators to the template.
@frewsxcv
Rollup merge of rust-lang#42586 - ideasman42:patch-1, r=steveklabnik
b646ca9 
Docstring: add missing term 'disjoint' from matches, rmatches

This follows `match_indices`
@frewsxcv
Rollup merge of rust-lang#42592 - ollie27:rustdoc_empty_modules, r=st…
8742619 
…eveklabnik

rustdoc: Stop stripping empty modules

There is no good reason to strip empty modules with no documentation and
doing so causes subtle problems.

Fixes rust-lang#42590
@frewsxcv
Rollup merge of rust-lang#42594 - ollie27:rustdoc_assoc_type_links, r…
3023cc4 
…=steveklabnik

rustdoc: Link directly to associated types

Rather than just linking to the trait.

Also simplifies the logic used to decide whether to render the full
QPath.
@rust-highfive
Copy link
Contributor

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

bors commented Jun 12, 2017

📌 Commit 3023cc4 has been approved by frewsxcv

@bors
Copy link
Collaborator

bors commented Jun 12, 2017

⌛ Testing commit 3023cc4 with merge cfb5deb...

bors added a commit that referenced this pull request Jun 12, 2017
@bors
Auto merge of #42605 - frewsxcv:rollup, r=frewsxcv
cfb5deb 
Rollup of 4 pull requests

- Successful merges: #42579, #42586, #42592, #42594
- Failed merges:
@bors
Copy link
Collaborator

bors commented Jun 12, 2017

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

@bors bors merged commit 3023cc4 into rust-lang:master Jun 12, 2017
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@frewsxcv @rust-highfive @bors @aturon @Centril @maccoda @ideasman42 @ollie27