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.

Sign up for GitHub

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

Jump to bottom

std: Update dependency on backtrace #61502

Merged
merged 1 commit into from
Jun 5, 2019
Merged

std: Update dependency on backtrace #61502

merged 1 commit into from
Jun 5, 2019

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Jun 3, 2019 •
edited
Loading

Discovered in #61416 an accidental regression in libstd's backtrace
behavior is that it previously attempted to consult libbacktrace and
would then fall back to dladdr if libbacktrace didn't report anything.
The backtrace crate, however, did not do this, so that's now been
fixed!

Changes: rust-lang/backtrace-rs@0.3.25...0.3.29

Closes #61416

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 3, 2019
@varkor
Copy link
Member

varkor commented Jun 3, 2019 •
edited
Loading

@bors p=5
It's difficult to debug ICEs without backtraces.

@bors

This comment has been minimized.

Sign in to view
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 3, 2019
@varkor varkor added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 3, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@alexcrichton
Copy link
Member Author

That error is in turn fixed by rust-lang/backtrace-rs@2e1d85f

@alexcrichton
Copy link
Member Author

Ok should be fixed now!

@estebank
Copy link
Contributor

estebank commented Jun 4, 2019

r? @estebank @bors r+

@bors
Copy link
Contributor

bors commented Jun 4, 2019

📌 Commit 3aa17d60383c7449b461ee6750eae36475768c76 has been approved by estebank

@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 4, 2019
@estebank
Copy link
Contributor

estebank commented Jun 4, 2019

@bors p=5

@bors
Copy link
Contributor

bors commented Jun 4, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout update-backtrace (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self update-backtrace --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@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 4, 2019
@alexcrichton
std: Update dependency on backtrace
fa1b6ad 
Discovered in rust-lang#61416 an accidental regression in libstd's backtrace
behavior is that it previously attempted to consult libbacktrace and
would then fall back to `dladdr` if libbacktrace didn't report anything.
The `backtrace` crate, however, did not do this, so that's now been
fixed!

Changes: rust-lang/backtrace-rs@0.3.25...0.3.27

Closes rust-lang#61416
@alexcrichton
Copy link
Member Author

@bors: r=estebank

@bors
Copy link
Contributor

bors commented Jun 5, 2019

📌 Commit fa1b6ad has been approved by estebank

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 5, 2019
@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 5, 2019
@bors
Copy link
Contributor

bors commented Jun 5, 2019

⌛ Testing commit fa1b6ad with merge b2e5436...

bors added a commit that referenced this pull request Jun 5, 2019
@bors
Auto merge of #61502 - alexcrichton:update-backtrace, r=estebank
b2e5436 
std: Update dependency on `backtrace`

Discovered in #61416 an accidental regression in libstd's backtrace
behavior is that it previously attempted to consult libbacktrace and
would then fall back to `dladdr` if libbacktrace didn't report anything.
The `backtrace` crate, however, did not do this, so that's now been
fixed!

Changes: rust-lang/backtrace-rs@0.3.25...0.3.29

Closes #61416
@bors
Copy link
Contributor

bors commented Jun 5, 2019

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 5, 2019
@varkor
Copy link
Member

varkor commented Jun 5, 2019

@bors retry

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

bors commented Jun 5, 2019

⌛ Testing commit fa1b6ad with merge 817d2fe...

bors added a commit that referenced this pull request Jun 5, 2019
@bors
Auto merge of #61502 - alexcrichton:update-backtrace, r=estebank
817d2fe 
std: Update dependency on `backtrace`

Discovered in #61416 an accidental regression in libstd's backtrace
behavior is that it previously attempted to consult libbacktrace and
would then fall back to `dladdr` if libbacktrace didn't report anything.
The `backtrace` crate, however, did not do this, so that's now been
fixed!

Changes: rust-lang/backtrace-rs@0.3.25...0.3.29

Closes #61416
@bors
Copy link
Contributor

bors commented Jun 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: estebank
Pushing 817d2fe to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2019
@bors bors merged commit fa1b6ad into rust-lang:master Jun 5, 2019
@alexcrichton alexcrichton deleted the update-backtrace branch July 8, 2019 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@estebank estebank

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: 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.

Recent nightly shows no info in backtraces
6 participants
@alexcrichton @rust-highfive @varkor @bors @estebank @nikomatsakis