Skip to content

remove event that causes panics in measureme tools - #65137

Merged
bors merged 1 commit into
rust-lang:masterfrom
andjo403:selfProfiling_fix
Oct 7, 2019
Merged

remove event that causes panics in measureme tools#65137
bors merged 1 commit into
rust-lang:masterfrom
andjo403:selfProfiling_fix

Conversation

@andjo403

@andjo403andjo403 commented Oct 5, 2019

Copy link
Copy Markdown
Contributor

the measureme tools summarize and crox do not alow a event to go out of scope of the parent event

codegen_and_optimize_crate ends after the codegen_crate event

r? @wesleywiser
cc @michaelwoerister@Mark-Simulacrum

@andjo403
remove event that causes panics in measureme tools
993e3a5
the measureme tools summarize and crox do not alow a event to go out of scope of the parent event
codegen_and_optimize_crate ends after the codegen_crate event
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 5, 2019
This was referenced Oct 5, 2019
Merged
Merged
@michaelwoerister

michaelwoerister commented Oct 7, 2019

Copy link
Copy Markdown
Member

Thanks for the PR, @andjo403! I want to make this work but for now let's unbreak the summarize tool.

@bors r+

@bors

bors commented Oct 7, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 993e3a5 has been approved by michaelwoerister

@borsbors 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 Oct 7, 2019
@michaelwoerister

michaelwoerister commented Oct 7, 2019

Copy link
Copy Markdown
Member

@bors p=1 (because it unbreaks perf.rlo)

Centril added a commit to Centril/rust that referenced this pull request Oct 7, 2019
@Centril
Rollup merge ofrust-lang#65137- andjo403:selfProfiling_fix, r=micha…
3a1f8df
…elwoerister
remove event that causes panics in measureme tools
the measureme tools summarize and crox do not alow a event to go out of scope of the parent event
codegen_and_optimize_crate ends after the codegen_crate event
r? @wesleywiser
cc @michaelwoerister@Mark-Simulacrum
@CentrilCentril mentioned this pull request Oct 7, 2019
Merged
bors added a commit that referenced this pull request Oct 7, 2019
@bors
Auto merge of#65178- Centril:rollup-ep1zztj, r=Centril
e3cb9ea
Rollup of 4 pull requests
Successful merges:
- #63948 (Add feature gate for raw_dylib.)
- #65137 (remove event that causes panics in measureme tools)
- #65164 (Add long error explanation for E0566)
- #65173 (Update reference)
Failed merges:
r? @ghost
@bors
bors merged commit 993e3a5 into rust-lang:masterOct 7, 2019
@wesleywiser

wesleywiser commented Oct 8, 2019

Copy link
Copy Markdown
Member

Thanks @andjo403 for tracking this down and thanks @michaelwoerister for reviewing!

@andjo403andjo403 mentioned this pull request Oct 10, 2019
Closed
@andjo403
andjo403 deleted the selfProfiling_fix branch October 10, 2019 16:35
@wesleywiserwesleywiser mentioned this pull request Oct 26, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@michaelwoeristermichaelwoerister

Labels

S-waiting-on-borsStatus: 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.

5 participants

@andjo403@michaelwoerister@bors@wesleywiser@rust-highfive