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 8 pull requests #65209

Merged
merged 23 commits into from
Oct 8, 2019
Merged

Rollup of 8 pull requests #65209

merged 23 commits into from
Oct 8, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 8, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 23 commits October 1, 2019 14:54
When thread sanitizer instrumentation is enabled during compilation of
stack probe function, the function will be miscompiled and trigger
segmentation fault at runtime. Disable stack probes when tsan is
enabled.
`.len()` returns length in bytes so it overestimates the required space
It's now unused, even with -Zquery-dep-graph
…-E0551, r=oli-obk

Add long error explanation for E0551

Part of rust-lang#61137
…chton

Disable stack probe when thread sanitizer is enabled

When thread sanitizer instrumentation is enabled during compilation of
stack probe function, the function will be miscompiled and trigger
segmentation fault at runtime. Disable stack probes when tsan is
enabled.
Correctly estimate the required space for string in `StyledBuffer::prepend`

Fix rust-lang#65119

r? @estebank
…=varkor

When suggesting assoc function with type params, include turbofish

Fix rust-lang#61412, fix rust-lang#61411.
…p, r=michaelwoerister

Remove loaded_from_cache map from DepGraph

It's now unused, even with -Zquery-dep-graph

From https://github.com/rust-lang/rust/pull/63756/files#r316039379 -- it'll simplify that PR to get this landed separately so we can just remove some of the code that it touches.

r? @Zoxc or @michaelwoerister
…aelwoerister

Remove query-related macros

The query system has a few macros that only have one or two call sites, and I find they hurt readability. This PR removes them.

r? @michaelwoerister
…-E0567, r=davidtwco

Add long error explanation for E0567

Part of rust-lang#61137.
@Centril
Copy link
Contributor Author

Centril commented Oct 8, 2019

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Oct 8, 2019

📌 Commit 3246ab2 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 Oct 8, 2019
@bors
Copy link
Contributor

bors commented Oct 8, 2019

⌛ Testing commit 3246ab2 with merge 2748a9f...

bors added a commit that referenced this pull request Oct 8, 2019
Rollup of 8 pull requests

Successful merges:

 - #64404 (Add long error explanation for E0495)
 - #64918 (Add long error explanation for E0551)
 - #65102 (Disable stack probe when thread sanitizer is enabled)
 - #65120 (Correctly estimate the required space for string in `StyledBuffer::prepend`)
 - #65145 (When suggesting assoc function with type params, include turbofish)
 - #65162 (Remove loaded_from_cache map from DepGraph)
 - #65176 (Remove query-related macros)
 - #65179 (Add long error explanation for E0567)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 8, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 8, 2019
@bors bors merged commit 3246ab2 into rust-lang:master Oct 8, 2019
@Centril Centril deleted the rollup-tzc0j87 branch October 8, 2019 21:33
@Centril Centril added the rollup A PR which is a rollup label Oct 18, 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