Rollup of 8 pull requests by Centril · Pull Request #69804 · rust-lang/rust

Centril · 2020-03-07T16:27:39Z

Successful merges:

Remove the no_debug feature #69667 (Remove the no_debug feature)
resolve, inconsistent binding mode: tweak wording #69687 (resolve, inconsistent binding mode: tweak wording)
On mismatched delimiters, only point at empty blocks that are in the same line #69708 (On mismatched delimiters, only point at empty blocks that are in the same line)
reduce test size for Miri #69765 (reduce test size for Miri)
fix various typos #69773 (fix various typos)
mir::Local is Copy we can pass it by value in these cases #69787 (mir::Local is Copy we can pass it by value in these cases)
Add Layout::dangling() to return a well-aligned NonNull<u8> #69794 (Add Layout::dangling() to return a well-aligned NonNull<u8>)
Correct version that relaxed orphan rules #69797 (Correct version that relaxed orphan rules)

Failed merges:

r? @ghost

…same line

@nikomatsakis

Remove the `no_debug` feature Context: rust-lang#29721 (comment) r? @nikomatsakis

@estebank

…estebank resolve, inconsistent binding mode: tweak wording Now that we can have e.g. `let Ok(x) | Err(x) = res;`, it's no longer appropriate to refer to "the same *match arm*", so let's tweak the wording. r? @estebank

On mismatched delimiters, only point at empty blocks that are in the same line We point at empty blocks when we have mismatched braces to detect cases where editors auto insert `}` after writing `{`. Gate this to only the case where the entire span is in the same line so we never point at explicitly empty blocks.

reduce test size for Miri The larger sizes take quite a while, and there is probably little point in repeating this quite so often.

fix various typos

@oli-obk

…opy, r=oli-obk mir::Local is Copy we can pass it by value in these cases r? @oli-obk

@Amanieu

Add `Layout::dangling()` to return a well-aligned `NonNull<u8>` Adds a convenient function to `Layout` to create a `NonNull<u8>` out of a layout to be returned on ZST allocations. This is the first item on the roadmap to support ZSTs in `AllocRef`: rust-lang/wg-allocators#38 (comment) r? @Amanieu

…mulacrum Correct version that relaxed orphan rules Docs say > Prior to Rust 1.40, if the destination type was not part of the current crate then you couldn't implement From directly Version 1.41 of Rust introduced the change to the orphan rules - https://blog.rust-lang.org/2020/01/30/Rust-1.41.0.html#relaxed-restrictions-when-implementing-traits - so this should say > Prior to Rust 1.41...

Centril · 2020-03-07T16:29:00Z

@bors r+ p=1001 rollup=never

bors · 2020-03-07T16:29:02Z

📌 Commit 8ee7278 has been approved by Centril

bors · 2020-03-07T16:29:03Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

bors · 2020-03-07T17:41:39Z

⌛ Testing commit 8ee7278 with merge 703fc64f9fa09c3ea37080aa653ee359a9ba96ad...

rust-highfive · 2020-03-07T18:16:28Z

Your PR failed (pretty log, 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.

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 @rust-lang/infra. (Feature Requests)

bors · 2020-03-07T18:16:36Z

💔 Test failed - checks-azure

rust-highfive · 2020-03-07T20:18:27Z

Your PR failed (pretty log, 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.

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 @rust-lang/infra. (Feature Requests)

bors · 2020-03-07T20:18:41Z

💔 Test failed - checks-azure

Dylan-DPC-zz · 2020-03-08T00:54:45Z

@bors treeclosed-

Dylan-DPC-zz · 2020-03-08T00:55:38Z

@bors retry

bors · 2020-03-08T00:58:28Z

⌛ Testing commit 8ee7278 with merge 52f039cce3f6d141072be54c8146a33934567183...

Dylan-DPC-zz · 2020-03-08T00:58:58Z

@bors treeclosed=1000 retry

bors · 2020-03-08T00:59:13Z

⌛ Testing commit 8ee7278 with merge da3b2b3305c35ce245cb80e4c326c8a038215178...

rust-highfive · 2020-03-08T01:00:40Z

Your PR failed (pretty log, 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.

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 @rust-lang/infra. (Feature Requests)

bors · 2020-03-08T05:02:31Z

💔 Test failed - checks-azure

Centril · 2020-03-08T05:27:17Z

@bors retry

bors · 2020-03-08T05:27:28Z

⌛ Testing commit 8ee7278 with merge f943349...

bors · 2020-03-08T09:16:29Z

☀️ Test successful - checks-azure
Approved by: Centril
Pushing f943349 to master...

JohnTitorand others added 20 commits March 3, 2020 18:22

Remove the no_debug feature
321d90e

Update tests
45a30cd

resolve, inconsistent binding mode: tweak wording.
cc9aad4

On mismatched delimiters, only point at empty blocks that are in the …
81f435d
…same line

reduce test size for Miri
2770f30

fix various typos
136ad01

Remove NO_DEBUG const
18080e6

bless tests
4c2b0f1

mir::Local is Copy we can pass it by value in these cases
0ed6e79

Add Layout::dangling() to return a well-aligned NonNull<u8>
545ef9d

Update alloc.rs
09d3ba1

Correct version that relaxed orphan rules
dffd18f

Rollup merge ofrust-lang#69667- JohnTitor:no-debug, r=nikomatsakis
614cd8d
Remove the `no_debug` feature Context: rust-lang#29721 (comment) r? @nikomatsakis

Rollup merge ofrust-lang#69765- RalfJung:miri-test, r=LukasKalbertodt
e6d4996
reduce test size for Miri The larger sizes take quite a while, and there is probably little point in repeating this quite so often.

Rollup merge ofrust-lang#69773- matthiaskrgr:typos, r=petrochenkov
10f999b
fix various typos

Rollup merge ofrust-lang#69787- spastorino:use-local-directly-its-c…
f1f4864
…opy, r=oli-obk mir::Local is Copy we can pass it by value in these cases r? @oli-obk

Centril added the rollup A PR which is a rollup label Mar 7, 2020

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 7, 2020

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 7, 2020

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 7, 2020

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 8, 2020

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 8, 2020

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 8, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 8, 2020

bors merged commit f943349 into rust-lang:masterMar 8, 2020

Centril deleted the rollup-u86dc1g branch March 8, 2020 09:16

This was referenced Mar 8, 2020
Implement new asm! syntax from RFC 2850 #69171
Merged
fix misleading type annotation diagonstics #69456
Merged
Clarify the relationship between forget() and ManuallyDrop. #69618
Merged
Improve expression & attribute parsing #69760
Merged

Uh oh!

Uh oh!

Conversation

Centril commented Mar 7, 2020

Uh oh!

Centril commented Mar 7, 2020

Uh oh!

bors commented Mar 7, 2020

Uh oh!

bors commented Mar 7, 2020

Uh oh!

bors commented Mar 7, 2020

Uh oh!

rust-highfive commented Mar 7, 2020

Uh oh!

bors commented Mar 7, 2020

Uh oh!

rust-highfive commented Mar 7, 2020

Uh oh!

bors commented Mar 7, 2020

Uh oh!

Dylan-DPC-zz commented Mar 8, 2020

Uh oh!

Dylan-DPC-zz commented Mar 8, 2020

Uh oh!

bors commented Mar 8, 2020

Uh oh!

Dylan-DPC-zz commented Mar 8, 2020

Uh oh!

bors commented Mar 8, 2020

Uh oh!

rust-highfive commented Mar 8, 2020

Uh oh!

bors commented Mar 8, 2020

Uh oh!

Centril commented Mar 8, 2020

Uh oh!

bors commented Mar 8, 2020

Uh oh!

bors commented Mar 8, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants