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

Fix zero-sized BTreeMap gdb pretty-printer #79235

Merged
merged 1 commit into from
Dec 2, 2020

Conversation

artemmukhin
Copy link
Contributor

gdb.parse_and_eval("()") is needed because GDB treats "()" as a Rust array of two characters, not as a unit

Based on intellij-rust/intellij-rust#6356

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(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 Nov 20, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 20, 2020

📌 Commit 4cf9369921407295bfb99a1c0e03737108f27ea5 has been approved by Mark-Simulacrum

@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 Nov 20, 2020
@bors
Copy link
Contributor

bors commented Nov 20, 2020

☔ The latest upstream changes (presumably #78104) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@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 Nov 20, 2020
@artemmukhin artemmukhin force-pushed the fix-btreemap-gdb-pretty-printer branch from 4cf9369 to 89c9dcb Compare November 23, 2020 11:15
@Mark-Simulacrum
Copy link
Member

tidy error: /checkout/src/etc/gdb_providers.py:232: line longer than 100 chars
tidy error: /checkout/src/etc/gdb_providers.py:233: line longer than 100 chars

CI seems to be failing here.

`gdb.parse_and_eval("()")` is needed because GDB treats "()" as a Rust array of two characters, not as a unit
@artemmukhin artemmukhin force-pushed the fix-btreemap-gdb-pretty-printer branch from 89c9dcb to 685e1f3 Compare November 23, 2020 14:07
@artemmukhin
Copy link
Contributor Author

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Nov 30, 2020

@ortem: 🔑 Insufficient privileges: Not in reviewers

@artemmukhin
Copy link
Contributor Author

@Mark-Simulacrum r?

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 30, 2020

📌 Commit 685e1f3 has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 30, 2020
@Mark-Simulacrum
Copy link
Member

(For the future, if you want my attention on a PR, @rustbot modify labels: +S-waiting-on-review -S-waiting-on-author or similar (depending on current label) is the best way to get things back in my queue).

@bors
Copy link
Contributor

bors commented Dec 2, 2020

⌛ Testing commit 685e1f3 with merge 92e4fb0...

@bors
Copy link
Contributor

bors commented Dec 2, 2020

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 92e4fb0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 2, 2020
@bors bors merged commit 92e4fb0 into rust-lang:master Dec 2, 2020
@rustbot rustbot added this to the 1.50.0 milestone Dec 2, 2020
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. 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.

5 participants