Skip to content

Rollup of 8 pull requests #43839

New issue

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

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

Already on GitHub? # to your account

Merged
merged 20 commits into from
Aug 13, 2017
Merged

Rollup of 8 pull requests #43839

merged 20 commits into from
Aug 13, 2017

Conversation

nrc and others added 20 commits August 10, 2017 17:59
Fix include! in doc tests

By making the path relative to the current file.

Fixes rust-lang#43153

[breaking-change] - if you use `include!` inside a doc test, you'll need to change the path to be relative to the current file rather than relative to the working directory.
…=frewsxcv

Missing links doc

r? @rust-lang/docs
Fix some typos

Follow up of rust-lang#43794

If refined my script a little bit and found some more.
…isdreavus

Improve doc examples for `include*` macros.
Handle DNS label compression in more places in Redox name resolution
…rochenkov

Include 'let' keyword to the span for ast::Local

Currently the span for `ast::Local` does not the include the `let` keyword. This PR fixes it.
Fix TcpStream::connect_timeout tracking issue number

Before: rust-lang#43709
After: rust-lang#43079

r? @sfackler
@rust-highfive
Copy link
Contributor

r? @aturon

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

@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Aug 13, 2017

📌 Commit a7ead41 has been approved by GuillaumeGomez

@bors
Copy link
Collaborator

bors commented Aug 13, 2017

⌛ Testing commit a7ead41 with merge a80a873...

bors added a commit that referenced this pull request Aug 13, 2017
Rollup of 8 pull requests

- Successful merges: #43782, #43803, #43814, #43819, #43821, #43822, #43824, #43833
- Failed merges:
@bors
Copy link
Collaborator

bors commented Aug 13, 2017

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

@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.