Skip to content

Comments

[beta] Process backports#51037

Merged
bors merged 11 commits intorust-lang:betafrom
emilyalbini:beta-backports
Jun 3, 2018
Merged

[beta] Process backports#51037
bors merged 11 commits intorust-lang:betafrom
emilyalbini:beta-backports

Conversation

@emilyalbini
Copy link
Member

@emilyalbini emilyalbini commented May 24, 2018 •
edited
Loading

Merged and approved:

r? @ghost

@emilyalbini emilyalbini added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 24, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@emilyalbini emilyalbini mentioned this pull request May 24, 2018
Merged
@rust-highfive

This comment has been minimized.

Sign in to view
@emilyalbini
Copy link
Member Author

emilyalbini commented May 25, 2018

@petrochenkov #50879 does not apply cleanly on the beta branch, can you please open a new PR with that?

@petrochenkov petrochenkov self-assigned this May 25, 2018
@petrochenkov
Copy link
Contributor

petrochenkov commented May 25, 2018

@pietroalbini
#50879 applied to beta: petrochenkov@258fabc

@petrochenkov petrochenkov removed their assignment May 25, 2018
@emilyalbini
Copy link
Member Author

emilyalbini commented May 25, 2018 •
edited
Loading

Thanks @petrochenkov!

Current PR status: both #51051 and #51011 needs to be approved before this PR can be merged.

@rust-highfive

This comment has been minimized.

Sign in to view
@kennytm kennytm added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2018
@kennytm
Copy link
Member

kennytm commented May 28, 2018

It looks like #51052 is also not beta-accepted yet.

@emilyalbini
Copy link
Member Author

emilyalbini commented May 31, 2018 •
edited
Loading

Ping @rust-lang/compiler, there are 3 backports that needs to be approved.

#51051 #51052 #51235

@oli-obk
Copy link
Contributor

oli-obk commented May 31, 2018

#51051 #51052 done

No idea about #51235

@emilyalbini
Copy link
Member Author

emilyalbini commented Jun 1, 2018

Also added #51146, which fixes a regression and needs to be approved for backport by the compiler team.

@oli-obk
Copy link
Contributor

oli-obk commented Jun 1, 2018

approved #51146

@oli-obk
Copy link
Contributor

oli-obk commented Jun 1, 2018

approved #51235 (reading issues really helps in understanding PRs -.-)

that should be all of them

@emilyalbini
Copy link
Member Author

emilyalbini commented Jun 1, 2018

Can someone r+ this? Don't have permissions myself.

@oli-obk
Copy link
Contributor

oli-obk commented Jun 1, 2018

@bors delegate

@oli-obk
Copy link
Contributor

oli-obk commented Jun 1, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 1, 2018

📌 Commit 64f813d has been approved by oli-obk

@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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 1, 2018
@emilyalbini
Copy link
Member Author

emilyalbini commented Jun 1, 2018

@bors p=1 (beta backports)

@bors
Copy link
Collaborator

bors commented Jun 1, 2018

⌛ Testing commit 64f813d with merge 13abb91...

bors added a commit that referenced this pull request Jun 1, 2018
@bors
Auto merge of #51037 - pietroalbini:beta-backports, r=oli-obk
13abb91 
[beta] Process backports

Merged and approved:

* #50812: Fix issue #50811 (`NaN > NaN` was true).
* #50827: Update LLVM to `56c931901cfb85cd6f7ed44c7d7520a8de1edf97`
* #50879: Fix naming conventions for new lints
* #51011: rustdoc: hide macro export statements from docs
* #51051: prohibit turbofish in `impl Trait` methods
* #51052: restore emplacement syntax (obsolete)
* #51146: typeck: Do not pass the field check on field error
* #51235: remove notion of Implicit derefs from mem-cat

r? @ghost
@bors
Copy link
Collaborator

bors commented Jun 1, 2018

💔 Test failed - status-appveyor

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 3, 2018
@bors
Copy link
Collaborator

bors commented Jun 3, 2018

⌛ Testing commit 52a3735 with merge 145e6d2915c182eb00d33853e68de8259c7a90e9...

@bors
Copy link
Collaborator

bors commented Jun 3, 2018

💔 Test failed - status-appveyor

@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 Jun 3, 2018
@emilyalbini
Copy link
Member Author

emilyalbini commented Jun 3, 2018

Ok, this failed again, so I guess it's LLVM fault.

kennytm and others added 11 commits June 3, 2018 12:03
@kennytm @emilyalbini
Make sure the float comparison output is consistent with the expected
fb4d42e 
behavior when NaN is involved.
@QuietMisdreavus @emilyalbini
rustdoc: hide macro export statements from docs
a6e0f04
@QuietMisdreavus @emilyalbini
update "pub-use-extern-macros" test to hide the regular import statement
451a9ce
@QuietMisdreavus @emilyalbini
fix @!has conditions in pub-use-extern-macros test
24815d3
@petrochenkov @emilyalbini
[beta] Fix naming conventions for new lints
068f4e0
@nikomatsakis @emilyalbini
prohibit turbofish in impl Trait methods
10f8495
@nikomatsakis @emilyalbini
restore emplacement syntax (obsolete)
cfb8cbe
@nikomatsakis @emilyalbini
pacify the mercilous tidy
201fc48
@emilyalbini
Fix build backporting rust-lang#51052
561310c
@nikomatsakis @emilyalbini
change PointerKind::Implicit to a note
d290217 
`PointerKind` is included in `LoanPath` and hence forms part of the
equality check; this led to having two unequal paths that both
represent `*x`, depending on whether the `*` was inserted
automatically or explicitly. Bad mojo. The `note` field, in contrast,
is intended more-or-less primarily for this purpose of adding extra
data.
@dlrobertson @emilyalbini
typeck: Do not pass the field check on field error
724cfd8 
If a struct pattern has a field error return an error.
@emilyalbini
Copy link
Member Author

emilyalbini commented Jun 3, 2018

Let's try without the LLVM backport.

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 3, 2018

📌 Commit 724cfd8 has been approved by pietroalbini

@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 Jun 3, 2018
@bors
Copy link
Collaborator

bors commented Jun 3, 2018

⌛ Testing commit 724cfd8 with merge eb01d0f...

bors added a commit that referenced this pull request Jun 3, 2018
@bors
Auto merge of #51037 - pietroalbini:beta-backports, r=pietroalbini
eb01d0f 
[beta] Process backports

Merged and approved:

* #50812: Fix issue #50811 (`NaN > NaN` was true).
* #50879: Fix naming conventions for new lints
* #51011: rustdoc: hide macro export statements from docs
* #51051: prohibit turbofish in impl Trait methods
* #51052: restore emplacement syntax (obsolete)
* #51146: typeck: Do not pass the field check on field error
* #51235: remove notion of Implicit derefs from mem-cat

r? @ghost
@bors
Copy link
Collaborator

bors commented Jun 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pietroalbini
Pushing eb01d0f to beta...

@bors bors merged commit 724cfd8 into rust-lang:beta Jun 3, 2018
@emilyalbini emilyalbini deleted the beta-backports branch June 3, 2018 18:04
@semarie semarie mentioned this pull request Jun 20, 2018
Closed
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

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.