Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #61716

Merged
merged 15 commits into from
Jun 10, 2019
Merged

Rollup of 5 pull requests #61716

merged 15 commits into from
Jun 10, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 10, 2019

Successful merges:

Failed merges:

r? @ghost

tobia and others added 15 commits April 13, 2019 01:24
instead import intrinsics locally in their wrapper functions
Changes:
````
travis: disable rls integration test.
rustup rust-lang#61669
Add OUTER_EXPN_INFO lint
````
When one tries to create a thread with a requested stack size larger
than 16 MB, the call will fail and the compiler will bail out. Therefore
we should limit the size of the thread stack to 16 MB on Haiku.
Replaced linear token counting macros with optimized implementation

There are currently two distinct token-counting macros in the source. Both implement the trivial algorithm, with linear complexity. They may or may not be adequate for their use case, but considering that other people are probably going to copy and paste them whenever they need a token-counting macro, I replaced them with an optimized implementation with logarithmic complexity.
get rid of real_intrinsics module

instead import intrinsics locally in their wrapper functions.

(These functions are wrapper functions as a preparation to fixing rust-lang#53871.)
Haiku: the maximum stack size is 16 MB

This keeps the compiler from crashing every time it is invoked. No functional change on other platforms.

This patch is similar to the limitation that is in the [librustdoc/lib.rs](https://github.com/rust-lang/rust/blob/57e13e0325c1d41161a31de1f8520538ec2c575c/src/librustdoc/lib.rs#L89).
…hearth

submodules: update clippy from 71be6f6 to c0dbd34

Changes:
````
travis: disable rls integration test.
rustup rust-lang#61669
Add OUTER_EXPN_INFO lint
````

Should fix clippy toolstate
@Centril
Copy link
Contributor Author

Centril commented Jun 10, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Jun 10, 2019

📌 Commit f90d348 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 Jun 10, 2019
@bors
Copy link
Contributor

bors commented Jun 10, 2019

⌛ Testing commit f90d348 with merge a73ecb3...

bors added a commit that referenced this pull request Jun 10, 2019
Rollup of 5 pull requests

Successful merges:

 - #59600 (Replaced linear token counting macros with optimized implementation)
 - #61501 (get rid of real_intrinsics module)
 - #61570 (Fix issues with const argument inference)
 - #61683 (Haiku: the maximum stack size is 16 MB)
 - #61697 (submodules: update clippy from 71be6f6 to c0dbd34)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 10, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 10, 2019
@bors bors merged commit f90d348 into rust-lang:master Jun 10, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #61716!

Tested on commit a73ecb3.
Direct link to PR: #61716

🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 10, 2019
Tested on commit rust-lang/rust@a73ecb3.
Direct link to PR: <rust-lang/rust#61716>

🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
@Centril Centril deleted the rollup-nxwf5ol branch June 10, 2019 14:09
@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
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
Development

Successfully merging this pull request may close these issues.

8 participants