BTreeMap: fix gdb provider on BTreeMap with ZST keys or values #77788
+43
−36
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit bb9da7a has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 14, 2020
Rollup of 8 pull requests Successful merges: - rust-lang#77765 (Add LLVM flags to limit DWARF version to 2 on BSD) - rust-lang#77788 (BTreeMap: fix gdb provider on BTreeMap with ZST keys or values) - rust-lang#77795 (Codegen backend interface refactor) - rust-lang#77808 (Moved the main `impl` for FnCtxt to its own file.) - rust-lang#77817 (Switch rustdoc from `clean::Stability` to `rustc_attr::Stability`) - rust-lang#77829 (bootstrap: only use compiler-builtins-c if they exist) - rust-lang#77870 (Use intra-doc links for links to module-level docs) - rust-lang#77897 (Move `Strip` into a separate rustdoc pass) Failed merges: - rust-lang#77879 (Provide better documentation and help messages for x.py setup) - rust-lang#77902 (Include aarch64-pc-windows-msvc in the dist manifests) r? `@ghost`
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Oct 16, 2020
…imulacrum BTreeMap: improve gdb introspection of BTreeMap with ZST keys or values I accidentally pushed an earlier revision in rust-lang#77788: it changes the index of tuples for BTreeSet from ""[{}]".format(i) to "key{}".format(i). Which doesn't seem to make the slightest difference on my linux box nor on CI. In fact, gdb doesn't make any distinction between "key{}" and "val{}" for a BTreeMap either, leading to confusing output if you test more. But easy to improve. r? @Mark-Simulacrum
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Oct 17, 2020
…imulacrum BTreeMap: improve gdb introspection of BTreeMap with ZST keys or values I accidentally pushed an earlier revision in rust-lang#77788: it changes the index of tuples for BTreeSet from ""[{}]".format(i) to "key{}".format(i). Which doesn't seem to make the slightest difference on my linux box nor on CI. In fact, gdb doesn't make any distinction between "key{}" and "val{}" for a BTreeMap either, leading to confusing output if you test more. But easy to improve. r? @Mark-Simulacrum
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Oct 17, 2020
…imulacrum BTreeMap: improve gdb introspection of BTreeMap with ZST keys or values I accidentally pushed an earlier revision in rust-lang#77788: it changes the index of tuples for BTreeSet from ""[{}]".format(i) to "key{}".format(i). Which doesn't seem to make the slightest difference on my linux box nor on CI. In fact, gdb doesn't make any distinction between "key{}" and "val{}" for a BTreeMap either, leading to confusing output if you test more. But easy to improve. r? @Mark-Simulacrum
artemmukhin
added a commit
to intellij-rust/intellij-rust
that referenced
this pull request
Nov 5, 2020
* Fixes #5722 * Do not fail on zero-sized keys or values rust-lang/rust#77788
artemmukhin
added a commit
to intellij-rust/intellij-rust
that referenced
this pull request
Nov 5, 2020
* Fixes #5722 * Handle zero-sized keys or values rust-lang/rust#77788
1 task
artemmukhin
added a commit
to intellij-rust/intellij-rust
that referenced
this pull request
Nov 10, 2020
* Fixes #5722 * Handle zero-sized keys or values rust-lang/rust#77788 * Drop rust-1.33.0 BTreeMap/BTreeSet support
bors bot
added a commit
to intellij-rust/intellij-rust
that referenced
this pull request
Nov 10, 2020
6356: DBG: Update BTreeMap/BTreeSet GDB pretty-printers r=Undin a=ortem Update `BTreeMap`/`BTreeSet` GDB pretty-printers to the recent rustc's version. * Fixes #5722 * Handle zero-sized keys or values rust-lang/rust#77788 I also added a fix to the original commit from rustc: `gdb.parse_and_eval("()")` instead of simple `"()"` in `children_of_node` method. This is needed because GDB treats `"()"` as a Rust array of two characters, not as a unit After merge: - [ ] Upstream a fix for zero-sized keys or values to rustc Co-authored-by: ortem <ortem00@gmail.com>
bors bot
added a commit
to intellij-rust/intellij-rust
that referenced
this pull request
Nov 10, 2020
6356: DBG: Update BTreeMap/BTreeSet GDB pretty-printers r=Undin a=ortem Update `BTreeMap`/`BTreeSet` GDB pretty-printers to the recent rustc's version. * Fixes #5722 * Handle zero-sized keys or values rust-lang/rust#77788 I also added a fix to the original commit from rustc: `gdb.parse_and_eval("()")` instead of simple `"()"` in `children_of_node` method. This is needed because GDB treats `"()"` as a Rust array of two characters, not as a unit After merge: - [ ] Upstream a fix for zero-sized keys or values to rustc Co-authored-by: ortem <ortem00@gmail.com>
Undin
pushed a commit
to intellij-rust/intellij-rust
that referenced
this pull request
Nov 12, 2020
* Fixes #5722 * Handle zero-sized keys or values rust-lang/rust#77788 * Drop rust-1.33.0 BTreeMap/BTreeSet support (cherry picked from commit 04a7930)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Avoid error when gdb is asked to inspect a BTreeMap or BTreeSet with a zero-sized type as key or value. And clean up.
r? @Mark-Simulacrum