Skip to content

Consolidate checking for msvc when generating debuginfo #92375

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged

Conversation

wesleywiser
Copy link
Member

If the target we're generating code for is msvc, then we do two main
things differently: we generate type names in a C++ style instead of a
Rust style and we generate debuginfo for enums differently.

I've refactored the code so that there is one function
(cpp_like_debuginfo) which determines if we should use the C++ style
of naming types and other debuginfo generation or the regular Rust one.

r? @michaelwoerister

This PR is not urgent so please don't let it interrupt your holidays! 🎄 🎁

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 28, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2021
Copy link
Member

@michaelwoerister michaelwoerister left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR, @wesleywiser! Looks good.

r=me with the comments resolved.

@michaelwoerister michaelwoerister 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 7, 2022
If the target we're generating code for is msvc, then we do two main
things differently: we generate type names in a C++ style instead of a
Rust style and we generate debuginfo for enums differently.

I've refactored the code so that there is one function
(`cpp_like_debuginfo`) which determines if we should use the C++ style
of naming types and other debuginfo generation or the regular Rust one.
@wesleywiser wesleywiser force-pushed the consolidate_debuginfo_msvc_check branch from 1aefa47 to 836addc Compare January 7, 2022 17:36
@wesleywiser
Copy link
Member Author

@bors r=michaelwoerister rollup

@bors
Copy link
Collaborator

bors commented Jan 7, 2022

📌 Commit 836addc has been approved by michaelwoerister

@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 Jan 7, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 8, 2022
…svc_check, r=michaelwoerister

Consolidate checking for msvc when generating debuginfo

If the target we're generating code for is msvc, then we do two main
things differently: we generate type names in a C++ style instead of a
Rust style and we generate debuginfo for enums differently.

I've refactored the code so that there is one function
(`cpp_like_debuginfo`) which determines if we should use the C++ style
of naming types and other debuginfo generation or the regular Rust one.

r? `@michaelwoerister`

This PR is not urgent so please don't let it interrupt your holidays! 🎄 🎁
@ehuss ehuss mentioned this pull request Jan 8, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 8, 2022
Rollup of 8 pull requests

Successful merges:

 - rust-lang#84640 (Implement `TryFrom<char>` for `u8`)
 - rust-lang#92336 (Remove &self from PrintState::to_string)
 - rust-lang#92375 (Consolidate checking for msvc when generating debuginfo)
 - rust-lang#92568 (Add note about non_exhaustive to variant_count)
 - rust-lang#92600 (Add some missing `#[must_use]` to some `f{32,64}` operations)
 - rust-lang#92610 (Create CSS class instead of using inline style for search results)
 - rust-lang#92632 (Implement stabilization of `#[feature(available_parallelism)]`)
 - rust-lang#92650 (Fix typo in `StableCrateId` docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5cddd24 into rust-lang:master Jan 8, 2022
@rustbot rustbot added this to the 1.59.0 milestone Jan 8, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants