Skip to content

Rollup of 10 pull requests#59433

Merged
bors merged 43 commits intorust-lang:masterfrom
Centril:rollup
Mar 26, 2019
Merged

Rollup of 10 pull requests#59433
bors merged 43 commits intorust-lang:masterfrom
Centril:rollup

Conversation

@Centril
Copy link
Contributor

@Centril Centril commented Mar 26, 2019

Successful merges:

Failed merges:

r? @ghost

Saleem Jaffer and others added 30 commits March 18, 2019 15:03
promoted is still left in 2 places
7fb1c22
cleaner code as per review
a837b8a
fixed all compilation errors
23c87a1
tidy checks
776407e
remove visit_static from librustc::mir
8829dda
@Zoxc
Add no_hash to query macro and move some queries over
72f8d4e
@Zoxc
Allow itertools
b440041
@Zoxc
Add no_force to query macro and move some queries over
d060e7d
@Zoxc
Add anon to query macro and move a query over
52374a6
@Zoxc
Add eval_always to query macro and move a query over
4d0a1e4
@Zoxc
Fix whitespace
75677c4
@ewk
Update build instructions in README.md
71dfb01 
Add additional instructions when `sudo ./x.py install` fails to
complete the build.

This resolves issues rust-lang#40108 and rust-lang#49269.
review fixes
cf2f1bb
@pnkfelix
Expand impl FromIterator for Option doc to include example of early…
48af718 
… termination.
@pnkfelix
Expand impl FromIterator for Result doc to include examples of `Err…
d5a61c0 
…` and early termination.
@faern
Add/rename checked_duration_since tests
37cfeb2
@faern
Make duration_since use checked_duration_since
d56b1fd
@faern
Update sys::time impls to have checked_sub_instant
1ccad16
@estebank
Expand suggestions for type ascription parse errors
8ba1a97
@estebank
Tweak labels
b1a6c32
@estebank
Only suggest let assignment for type ascription if we find an equals …
72a3089 
…sign
@estebank
Hide "type ascription is experimental error" unless it's the only one
81b876b 
In order to minimize the verbosity of common syntax errors that are parsed
as type ascription, hide the feature gate error unless there are no other
errors being emitted by the parser.
@estebank
Review comment
44a086e
@estebank
Reword type ascription note to reduce verbosity
d72ef21
adding mir::StaticKind enum for static and promoted
752544b
code review fixes
fb93f10
@euclio
replace redundant note in deprecation warning
8d7c2bb
@estebank
Provide suggestion when using field access instead of path
5390414 
When trying to access an associated constant as if it were a field of
an instance, provide a suggestion for the correct syntax.
@estebank
Deduplicate code for path suggestion
4beea17
@killercup @pnkfelix
Update src/libcore/option.rs
6315221 
Co-Authored-By: pnkfelix <pnkfelix@pnkfx.org>
@Centril
Rollup merge of rust-lang#59419 - frewsxcv:frewsxcv-qu, r=varkor
822b4fc 
Utilize `?` instead of `return None`.

None
@Centril
Copy link
Contributor Author

Centril commented Mar 26, 2019

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Mar 26, 2019

📌 Commit 822b4fc has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 26, 2019
@bors
Copy link
Collaborator

bors commented Mar 26, 2019

⌛ Testing commit 822b4fc with merge 5684f68...

bors added a commit that referenced this pull request Mar 26, 2019
@bors
Auto merge of #59433 - Centril:rollup, r=Centril
5684f68 
Rollup of 10 pull requests

Successful merges:

 - #59150 (Expand suggestions for type ascription parse errors)
 - #59232 (Merge `Promoted` and `Static` in `mir::Place`)
 - #59267 (Provide suggestion when using field access instead of path)
 - #59315 (Add no_hash to query macro and move some queries over)
 - #59334 (Update build instructions in README.md)
 - #59362 (Demo `FromIterator` short-circuiting)
 - #59374 (Simplify checked_duration_since)
 - #59389 (replace redundant note in deprecation warning)
 - #59410 (Clarify `{Ord,f32,f64}::clamp` docs a little)
 - #59419 (Utilize `?` instead of `return None`.)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Mar 26, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 26, 2019

The job dist-x86_64-apple of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
[00:03:45]       Memory: 8 GB
[00:03:45]       Boot ROM Version: VMW71.00V.7581552.B64.1801142334
[00:03:45]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:45]       SMC Version (system): 2.8f0
[00:03:45]       Serial Number (system): VM9IxKbEj6YB
[00:03:45] 
[00:03:45] hw.ncpu: 4
[00:03:45] hw.byteorder: 1234
[00:03:45] hw.memsize: 8589934592
---

[02:48:37] [TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "x86_64-apple-darwin" }, target: "x86_64-apple-darwin", tool: "fabricate", path: "src/tools/rust-installer", mode: ToolBootstrap, is_optional_tool: false, source_type: Submodule, extra_features: [] } -- 62.657
[02:49:48] [TIMING] Docs { stage: 2, host: "x86_64-apple-darwin" } -- 75.197
[02:49:48] Dist docs (aarch64-apple-ios)
The job exceeded the maximum time limit for jobs, and has been terminated.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 26, 2019
@Centril
Copy link
Contributor Author

Centril commented Mar 26, 2019

@bors retry

@bors bors 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 Mar 26, 2019
@bors
Copy link
Collaborator

bors commented Mar 26, 2019

⌛ Testing commit 822b4fc with merge fbd34ef...

bors added a commit that referenced this pull request Mar 26, 2019
@bors
Auto merge of #59433 - Centril:rollup, r=Centril
fbd34ef 
Rollup of 10 pull requests

Successful merges:

 - #59150 (Expand suggestions for type ascription parse errors)
 - #59232 (Merge `Promoted` and `Static` in `mir::Place`)
 - #59267 (Provide suggestion when using field access instead of path)
 - #59315 (Add no_hash to query macro and move some queries over)
 - #59334 (Update build instructions in README.md)
 - #59362 (Demo `FromIterator` short-circuiting)
 - #59374 (Simplify checked_duration_since)
 - #59389 (replace redundant note in deprecation warning)
 - #59410 (Clarify `{Ord,f32,f64}::clamp` docs a little)
 - #59419 (Utilize `?` instead of `return None`.)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Mar 26, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing fbd34ef to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 26, 2019
@bors bors merged commit 822b4fc into rust-lang:master Mar 26, 2019
This was referenced Mar 26, 2019
Closed
Merged
Closed
Closed
Merged
Closed
Closed
Merged
Merged
Closed
@Centril Centril deleted the rollup branch March 27, 2019 07:26
@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

No one assigned

Labels

merged-by-bors This PR was explicitly merged by bors. 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.