Skip to content

std: Reduce checks for feature = "backtrace" - #64765

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:less-check-backtrace
Oct 6, 2019
Merged

std: Reduce checks for feature = "backtrace"#64765
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:less-check-backtrace

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

This is a stylistic change to libstd to reduce the number of checks of
feature = "backtrace" now that we unconditionally depend on the
backtrace crate and rely on it having an empty implementation.
otherwise.

This is a stylistic change to libstd to reduce the number of checks of
`feature = "backtrace"` now that we unconditionally depend on the
`backtrace` crate and rely on it having an empty implementation.
otherwise.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @TimNN

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 25, 2019
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

r? @sfackler

@rust-highfiverust-highfive assigned sfackler and unassigned TimNNSep 25, 2019
@sfackler

Copy link
Copy Markdown
Member

Do we need to do anything to ensure that rust_backtrace_env is reliably inlined so the constant propagation works?

@sfacklersfackler reopened this Sep 25, 2019
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

Nah this is all in one CGU typically anyway or should be inlined with ThinLTO

@JohnCSimon

Copy link
Copy Markdown

Ping from triage
@alexcrichton@sfackler Hi! This has sat idle for the last 10 days.

Thanks

@sfackler

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Oct 5, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 1d06058 has been approved by sfackler

@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 5, 2019
@bors

bors commented Oct 5, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1d06058 with merge dbb2bda43aa5730a8df2a4deb30766462d4066c9...

tmandry added a commit to tmandry/rust that referenced this pull request Oct 5, 2019
…r=sfackler
std: Reduce checks for `feature = "backtrace"`
This is a stylistic change to libstd to reduce the number of checks of
`feature = "backtrace"` now that we unconditionally depend on the
`backtrace` crate and rely on it having an empty implementation.
otherwise.
@tmandrytmandry mentioned this pull request Oct 5, 2019
@tmandry

Copy link
Copy Markdown
Member

@bors retry rolled up

tmandry added a commit to tmandry/rust that referenced this pull request Oct 6, 2019
…r=sfackler
std: Reduce checks for `feature = "backtrace"`
This is a stylistic change to libstd to reduce the number of checks of
`feature = "backtrace"` now that we unconditionally depend on the
`backtrace` crate and rely on it having an empty implementation.
otherwise.
@tmandrytmandry mentioned this pull request Oct 6, 2019
bors added a commit that referenced this pull request Oct 6, 2019
Rollup of 18 pull requests
This contains changes from all the successful runs that bors marked as timed out, plus a revert of #63649 which appears to be the immediate cause of the timeouts.
Successful merges:
- #64708 (Stabilize `Option::as_deref` and `Option::as_deref_mut`)
- #64728 (Stabilize UdpSocket::peer_addr)
- #64765 (std: Reduce checks for `feature = "backtrace"`)
- #64909 (When encountering chained operators use heuristics to recover from bad turbofish)
- #65011 (Do not ICE when dereferencing non-Copy raw pointer)
- #65064 (permit asyncawait-ondeck to be added by anyone)
- #65066 ([const-prop] Fix ICE when trying to eval polymorphic promoted MIR)
- #65100 (Replace GeneratorSubsts with SubstsRef)
- #65105 (Split out some passes from librustc)
- #65106 (Allow unused attributes to avoid incremental bug)
- #65113 (Fix lonely backtick)
- #65116 (Remove unneeded visit_statement definition)
- #65118 (Update the documented default of -Z mutable-noalias)
- #65123 (Account for macro invocation in `let mut $pat` diagnostic.)
- #65124 (Replace some instances of `as *[const | mut] _` with `.cast()`)
- #65126 (Fix typo on `now()` comments)
- #65130 (lint: extern non-exhaustive types are improper)
- #65151 (Revert #63649 - "Upgrade Emscripten targets to use upstream LLVM backend")
Failed merges:
r? @ghost
@bors
bors merged commit 1d06058 into rust-lang:masterOct 6, 2019
@alexcrichton
alexcrichton deleted the less-check-backtrace branch January 14, 2020 18:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

7 participants

@alexcrichton@rust-highfive@sfackler@JohnCSimon@bors@tmandry@TimNN