Skip to content

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 9, 2019

also consistently mark all these is_* methods for inlining

@rust-highfive
Copy link
Contributor

r? @cramertj

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2019
@Centril
Copy link
Contributor

Centril commented Jun 9, 2019

@bors try

@bors
Copy link
Collaborator

bors commented Jun 9, 2019

⌛ Trying commit 5b54a78 with merge 59c2273...

bors added a commit that referenced this pull request Jun 9, 2019
is_fp and is_floating_point do the same thing, remove the former

also consistently mark all these `is_*` methods for inlining
@bors
Copy link
Collaborator

bors commented Jun 9, 2019

☀️ Try build successful - checks-travis
Build commit: 59c2273

@Centril
Copy link
Contributor

Centril commented Jun 9, 2019

@rust-timer build 59c2273

@rust-timer
Copy link
Collaborator

Success: Queued 59c2273 with parent 07c3967, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 59c2273, comparison URL.

@RalfJung
Copy link
Member Author

Looks like no change?

@Centril
Copy link
Contributor

Centril commented Jun 10, 2019

Yeah; just noise...

@cramertj
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 10, 2019

📌 Commit 5b54a78 has been approved by cramertj

@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 10, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 11, 2019
is_fp and is_floating_point do the same thing, remove the former

also consistently mark all these `is_*` methods for inlining
@Centril
Copy link
Contributor

Centril commented Jun 11, 2019

@bors r- conflict.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 11, 2019
@bors
Copy link
Collaborator

bors commented Jun 11, 2019

☔ The latest upstream changes (presumably #61673) made this pull request unmergeable. Please resolve the merge conflicts.

also consistently mark all these is_* methods for inlining
@RalfJung RalfJung force-pushed the is-floating-point branch from 5b54a78 to 87d5fe0 Compare June 11, 2019 17:46
@RalfJung
Copy link
Member Author

Rebased locally (without conflicts).

@bors r= cramertj rollup

@bors
Copy link
Collaborator

bors commented Jun 11, 2019

📌 Commit 87d5fe0 has been approved by ``

@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 11, 2019
@RalfJung
Copy link
Member Author

@bors r=cramertj rollup

@bors
Copy link
Collaborator

bors commented Jun 11, 2019

📌 Commit 87d5fe0 has been approved by cramertj

Centril added a commit to Centril/rust that referenced this pull request Jun 12, 2019
is_fp and is_floating_point do the same thing, remove the former

also consistently mark all these `is_*` methods for inlining
bors added a commit that referenced this pull request Jun 12, 2019
Rollup of 9 pull requests

Successful merges:

 - #60187 (Generator optimization: Overlap locals that never have storage live at the same time)
 - #61348 (Implement Clone::clone_from for Option and Result)
 - #61568 (Use Symbol, Span in libfmt_macros)
 - #61632 (ci: Collect CPU usage statistics on Azure)
 - #61654 (use pattern matching for slices destructuring)
 - #61671 (implement nth_back for Range(Inclusive))
 - #61688 (is_fp and is_floating_point do the same thing, remove the former)
 - #61705 (Pass cflags rather than cxxflags to LLVM as CMAKE_C_FLAGS)
 - #61734 (Migrate rust-by-example to MdBook2)

Failed merges:

r? @ghost
@bors bors merged commit 87d5fe0 into rust-lang:master Jun 12, 2019
@RalfJung RalfJung deleted the is-floating-point branch June 21, 2019 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

6 participants