make ty::Const debug printing less verbose #115884
Merged
Conversation
This file contains 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
|
r? @b-naber (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
RalfJung
commented
Sep 16, 2023
| @@ -22,7 +22,7 @@ | |||
| | | |||
| fn main() -> () { | |||
| let mut _0: (); | |||
| let mut _1: [usize; Const { ty: usize, kind: Leaf(0x00000003) }]; | |||
| let mut _1: [usize; ValTree(Leaf(0x00000003): usize)]; | |||
There was a problem hiding this comment.
This test seems to enable "always verbose" mode, that's why it doesn't get 3_usize.
bors
added
S-waiting-on-bors
RalfJung
commented
Sep 16, 2023
| if let ConstKind::Value(_) = this.data.kind() { | ||
| return ty::tls::with(move |tcx| { | ||
| // Somehow trying to lift the valtree results in lifetime errors, so we lift the | ||
| // entire constant. |
There was a problem hiding this comment.
Turns out the Valtree Lift impl is bogus.
There was a problem hiding this comment.
Note: #115831 is (coincidentally) about to remove a bunch of unused Lift impls, including the bogus one for Valtree. This shouldn't cause you problems given that you'll need to adjust the implementation, but I'm mentioning it just so it doesn't catch you unawares.
There was a problem hiding this comment.
Ah, yeah not having it seems better than having a broken one. :) But it does mean the comment here will be outdated. I can't update it any more since the PR was already rolled up.
I do wonder what that means for performance (lifting the entire constant with the valtree -- valtrees are not interned so equality is probably expensive). Maybe valtree child lists should be interned to make this easier and faster?
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 16, 2023
…iaskrgr Rollup of 2 pull requests Successful merges: - rust-lang#115607 (clarify that unsafe code must not rely on our safe traits) - rust-lang#115866 (make interpreter and TyAndLayout type Debug impl independent of Ty debug impl) Failed merges: - rust-lang#115873 (Make `TyKind::Adt`'s `Debug` impl be more pretty) - rust-lang#115884 (make ty::Const debug printing less verbose) r? `@ghost` `@rustbot` modify labels: rollup
|
☔ The latest upstream changes (presumably #115889) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
RalfJung
force-pushed
the
const-debug-print
branch
from
7e36514 to
5a3410a
Compare
|
@bors r=oli-obk |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 16, 2023
…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#115860 (Enable varargs support for AAPCS calling convention) - rust-lang#115867 (coverage: Simplify internal representation of debug types) - rust-lang#115885 (don't globally ignore rustc-ice files) Failed merges: - rust-lang#115873 (Make `TyKind::Adt`'s `Debug` impl be more pretty) - rust-lang#115884 (make ty::Const debug printing less verbose) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 16, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#115247 (Document std limitations before/after main) - rust-lang#115329 (fix std::primitive doc: homogenous -> homogeneous) - rust-lang#115487 (Improve documentation on when signes are printed by default) - rust-lang#115560 (Update doc for `alloc::format!` and `core::concat!`) - rust-lang#115836 (update rust_analyzer_settings.json) - rust-lang#115884 (make ty::Const debug printing less verbose) - rust-lang#115890 (Migrate GUI colors test to original CSS color format) - rust-lang#115895 (Improve Vec(Deque)::truncate documentation) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 16, 2023
Rollup merge of rust-lang#115884 - RalfJung:const-debug-print, r=oli-obk make ty::Const debug printing less verbose Similar in spirit to rust-lang#115873
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.
Similar in spirit to #115873