Skip to content

Rollup of 7 pull requests - #51257

Merged
bors merged 17 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup
May 31, 2018
Merged

Rollup of 7 pull requests#51257
bors merged 17 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

GuillaumeGomezand others added 17 commits May 30, 2018 01:12
We already got the open file descriptor at this point.
Don't make the kernel resolve the path again.
By calling `bump()` after getting the first char, to avoid a redundant
`ident_continue()` test on it.
If a struct pattern has a field error return an error.
…r-format, r=oli-obk
Stabilize short error format
r? @oli-obk
Added in rust-lang#44636
Update build instructions
It get stuck at the cloning step.
`./x.py build `
Updating only changed submodules
Updating submodule src/llvm
Submodule 'src/llvm' (https://github.com/rust-lang/llvm.git) registered for path 'src/llvm'
Cloning into '/home/username/rust/src/llvm'...
typeck: Do not pass the field check on field error
If a struct pattern has a field error return an error.
Fixes: rust-lang#51102
…r=QuietMisdreavus
Fixes some style issues in rustdoc "implementations on Foreign types"
Fixesrust-lang#51113.
r? @QuietMisdreavus
fs: copy: Use File::set_permissions instead of fs::set_permissions
We already got the open file descriptor at this point.
Don't make the kernel resolve the path again.
mod.rs isn't beautiful
I hate this spaces.
@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @frewsxcv

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 31, 2018
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=7

@bors

bors commented May 31, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 7552c2e has been approved by GuillaumeGomez

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 31, 2018
@bors

bors commented May 31, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7552c2e with merge 1ffb321...

bors added a commit that referenced this pull request May 31, 2018
Rollup of 7 pull requests
Successful merges:
- #49546 (Stabilize short error format)
- #51123 (Update build instructions)
- #51146 (typeck: Do not pass the field check on field error)
- #51193 (Fixes some style issues in rustdoc "implementations on Foreign types")
- #51213 (fs: copy: Use File::set_permissions instead of fs::set_permissions)
- #51227 (mod.rs isn't beautiful)
- #51240 (Two minor parsing tweaks)
Failed merges:
@bors

bors commented May 31, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 7552c2e into rust-lang:masterMay 31, 2018
@GuillaumeGomez
GuillaumeGomez deleted the rollup branch May 31, 2018 23:25
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

10 participants

@GuillaumeGomez@rust-highfive@bors@frewsxcv@Centril@nicokoch@uuttff8@nnethercote@dlrobertson@akoserwal