Skip to content

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

Merged
bors merged 11 commits into
rust-lang:masterfrom
marmeladema:fix-closure-path-printing
Sep 26, 2020
Merged

Move from {{closure}}#0 syntax to {closure#0} for (def) path components#76176
bors merged 11 commits into
rust-lang:masterfrom
marmeladema:fix-closure-path-printing

Conversation

@marmeladema

@marmelademamarmeladema commented Aug 31, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

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

r? @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 31, 2020
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_codegen_llvm/src/debuginfo/namespace.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_lint/src/context.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_mir/src/interpret/intrinsics/type_name.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_mir/src/monomorphize/partitioning/default.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_middle/src/ty/query/profiling_support.rs Outdated
eddyb
eddyb reviewed Aug 31, 2020
View reviewed changes
Comment threadcompiler/rustc_middle/src/ty/query/profiling_support.rs Outdated
@marmeladema
marmelademaforce-pushed the fix-closure-path-printing branch 2 times, most recently from 277e65a to 93ce1e4CompareAugust 31, 2020 23:43
eddyb
eddyb reviewed Sep 1, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Sep 1, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Sep 1, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
eddyb
eddyb reviewed Sep 1, 2020
View reviewed changes
Comment threadcompiler/rustc_hir/src/definitions.rs Outdated
@marmeladema
marmelademaforce-pushed the fix-closure-path-printing branch 3 times, most recently from 7588122 to ee81a4eCompareSeptember 1, 2020 18:35
@bors

This comment has been minimized.

Sign in to view
@marmeladema
marmelademaforce-pushed the fix-closure-path-printing branch from 44c6c76 to aeace7fCompareSeptember 8, 2020 22:33
@eddyb

eddyb commented Sep 25, 2020

Copy link
Copy Markdown
Contributor

@bors r+ Thanks!

@bors

bors commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 6785568870cac091755900f1623795535f41591b has been approved by eddyb

@borsbors 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 Sep 25, 2020
@marmeladema
marmelademaforce-pushed the fix-closure-path-printing branch from 6785568 to 5946c12CompareSeptember 25, 2020 21:54
@eddyb

eddyb commented Sep 25, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 5946c12 has been approved by eddyb

@bors

bors commented Sep 26, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5946c12 with merge c6622d1...

@bors

bors commented Sep 26, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 26, 2020
@bors
bors merged commit c6622d1 into rust-lang:masterSep 26, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 26, 2020
This was referenced Sep 26, 2020
Closed
Closed
Merged
Merged
@marmeladema
marmeladema deleted the fix-closure-path-printing branch September 26, 2020 08:15
@arora-amanarora-aman mentioned this pull request Nov 6, 2020
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.48.0

Development

Successfully merging this pull request may close these issues.

6 participants

@marmeladema@bors@eddyb@rust-highfive@jyn514@rustbot