Move from {{closure}}#0 syntax to {closure#0} for (def) path components #76176

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

Merged

bors merged 11 commits into rust-lang:master from marmeladema:fix-closure-path-printing

Sep 26, 2020

Contributor

marmeladema commented Aug 31, 2020 •

edited

Loading

Part of #70334

I followed the approach described by @eddyb and introduced a DefPathDataName enum.
To preserve compatibility, in various places, I had to rely on formatting manually by calling format!("{{{{{}}}}}", namespace).

My questions are:

Do we want to convert for places to use the new naming scheme? Or shall I re-add DefPathData::as_symbol but renamed as DefPathData::as_legacy_symbol to avoid manually allocating the legacy symbols?
Do we want to impl Display for DisambiguatedDefPathData to avoid manually calling write!(s, "{{{}#{}}}", namespace, component.disambiguator)?
We might also want to improve naming for DefPathDataName and DefPathData::get_name

rust-highfive assigned eddyb

rust-highfive added the S-waiting-on-review label

eddyb reviewed

View reviewed changes

compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_lint/src/context.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_middle/src/ty/print/pretty.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_middle/src/ty/print/pretty.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_middle/src/ty/print/pretty.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_mir/src/interpret/intrinsics/type_name.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_mir/src/monomorphize/partitioning/default.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_middle/src/ty/query/profiling_support.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_middle/src/ty/query/profiling_support.rs Outdated Show resolved Hide resolved

marmeladema force-pushed the fix-closure-path-printing branch 2 times, most recently from 277e65a to 93ce1e4 Compare

August 31, 2020 23:43

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

eddyb reviewed

View reviewed changes

compiler/rustc_hir/src/definitions.rs Outdated Show resolved Hide resolved

marmeladema force-pushed the fix-closure-path-printing branch 3 times, most recently from 7588122 to ee81a4e Compare

September 1, 2020 18:35

marmeladema requested a review from eddyb

September 1, 2020 18:43

This comment has been minimized.

Sign in to view

marmeladema force-pushed the fix-closure-path-printing branch from 44c6c76 to aeace7f Compare

September 8, 2020 22:33

eddyb approved these changes

View reviewed changes

Member

eddyb commented Sep 25, 2020

@bors r+ Thanks!

Collaborator

bors commented Sep 25, 2020

📌 Commit 6785568870cac091755900f1623795535f41591b has been approved by eddyb

bors added S-waiting-on-bors and removed S-waiting-on-review labels

marmeladema added 11 commits

September 25, 2020 22:46


          Move from {{closure}}#0 syntax to {closure#0} for (def) path components

f1878d1


          Implement Display for DisambiguatedDefPathData and DefPathData

9f50c49


          Fix pretty-printing of DisambiguatedDefPathData

2708ad8


          Rename DefPathData::get_name() to DefPathData::name()

657ecdb


          Avoid calling Symbol::interner in compute_codegen_unit_name

75130b0


          Simplify some match statements on `DefPathDataName'

bb8e176


          Fix profiling query key creation

23085b6


          Remove now unused double_braced_* symbols

f25d0bc


          Fix tests

601c284


          Address review comment

35bad3e


          Move is_raw_guess check in ty::print::pretty

5946c12

marmeladema force-pushed the fix-closure-path-printing branch from 6785568 to 5946c12 Compare

September 25, 2020 21:54

Member

eddyb commented Sep 25, 2020

Collaborator

bors commented Sep 25, 2020

📌 Commit 5946c12 has been approved by eddyb

Collaborator

bors commented Sep 26, 2020

⌛ Testing commit 5946c12 with merge c6622d1...

Collaborator

bors commented Sep 26, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: eddyb
Pushing c6622d1 to master...

bors added the merged-by-bors label

bors merged commit c6622d1 into rust-lang:master

rustbot added this to the 1.48.0 milestone

This was referenced Sep 26, 2020

[WIP] Token-based outer attributes handling #76130

Closed

I can't stop writing copy propagation passes #76723

Closed

Clean up diagnostics for arithmetic operation errors #76754

Merged

pretty.rs: Update Closure and Generator print #77069

Merged

marmeladema deleted the fix-closure-path-printing branch

September 26, 2020 08:15

arora-aman mentioned this pull request

Printing of closure types and MIR closure constructors #66869

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors S-waiting-on-bors T-compiler