Skip to content
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

Improved collapse_debuginfo attribute, added command-line flag #119828

Merged
merged 1 commit into from
Jan 19, 2024
Merged

Improved collapse_debuginfo attribute, added command-line flag #119828

merged 1 commit into from
Jan 19, 2024

Conversation

azhogin
Copy link
Contributor

@azhogin azhogin commented Jan 10, 2024 •
edited by petrochenkov
Loading

Improved attribute collapse_debuginfo with variants: #[collapse_debuginfo=(no|external|yes)].
Added command-line flag for default behaviour.
Work-in-progress: will add more tests.

cc #100758

@rustbot
Copy link
Collaborator

rustbot commented Jan 10, 2024

r? @WaffleLapkin

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 10, 2024
@WaffleLapkin
Copy link
Member

Marking as S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. , once this is ready for review, please use @rustbot review (learn more about rustbot commands). @rustbot author.

@rustbot rustbot 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 10, 2024
@azhogin
Copy link
Contributor Author

azhogin commented Jan 10, 2024

r? @petrochenkov

@rustbot rustbot assigned petrochenkov and unassigned WaffleLapkin Jan 10, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@azhogin azhogin force-pushed the azhogin/collapse_debuginfo_improved_attr branch from 0d05bf8 to f3adf78 Compare January 11, 2024 06:24
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@azhogin azhogin force-pushed the azhogin/collapse_debuginfo_improved_attr branch from f3adf78 to 6e21180 Compare January 11, 2024 06:44
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@azhogin azhogin force-pushed the azhogin/collapse_debuginfo_improved_attr branch from 6e21180 to 80619bc Compare January 11, 2024 14:59
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@azhogin azhogin force-pushed the azhogin/collapse_debuginfo_improved_attr branch 3 times, most recently from 48a832c to 2065508 Compare January 14, 2024 18:55
@azhogin azhogin changed the title Improved collapse_debuginfo attribute, added command-line flag (WIP) Improved collapse_debuginfo attribute, added command-line flag Jan 14, 2024
@azhogin azhogin marked this pull request as ready for review January 14, 2024 19:52
@azhogin
Copy link
Contributor Author

azhogin commented Jan 14, 2024

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2024
petrochenkov
petrochenkov reviewed Jan 15, 2024
View reviewed changes
compiler/rustc_span/src/hygiene.rs Outdated Show resolved Hide resolved
compiler/rustc_span/src/hygiene.rs Outdated Show resolved Hide resolved
tests/debuginfo/collapse-debuginfo-external-flag-overriden-by-attr.rs Outdated Show resolved Hide resolved
compiler/rustc_session/src/options.rs Outdated Show resolved Hide resolved
compiler/rustc_session/src/options.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/base.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/base.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/base.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/base.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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 15, 2024
@bors

This comment was marked as resolved.

Sign in to view
@azhogin azhogin force-pushed the azhogin/collapse_debuginfo_improved_attr branch from 2065508 to 0743f9c Compare January 16, 2024 15:38
@azhogin azhogin force-pushed the azhogin/collapse_debuginfo_improved_attr branch from 0743f9c to 150d59c Compare January 16, 2024 18:05
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@azhogin azhogin force-pushed the azhogin/collapse_debuginfo_improved_attr branch from 150d59c to 6dddef7 Compare January 16, 2024 19:27
petrochenkov
petrochenkov reviewed Jan 16, 2024
View reviewed changes
compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/mbe/macro_rules.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/base.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/base.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/base.rs Outdated Show resolved Hide resolved
@azhogin azhogin force-pushed the azhogin/collapse_debuginfo_improved_attr branch from 6dddef7 to 8507f51 Compare January 17, 2024 16:18
@petrochenkov
Copy link
Contributor

Looks ready and CI is green.
@bors r+

@bors
Copy link
Contributor

bors commented Jan 17, 2024

📌 Commit 8507f51 has been approved by petrochenkov

It is now in the queue for this repository.

@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 17, 2024
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 17, 2024
@compiler-errors
Rollup merge of rust-lang#119828 - azhogin:azhogin/collapse_debuginfo…
b37d526 
…_improved_attr, r=petrochenkov

Improved collapse_debuginfo attribute, added command-line flag

Improved attribute collapse_debuginfo with variants: `#[collapse_debuginfo=(no|external|yes)]`.
Added command-line flag for default behaviour.
Work-in-progress: will add more tests.

cc rust-lang#100758
@compiler-errors compiler-errors mentioned this pull request Jan 17, 2024
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 18, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2024
@bors
Auto merge of rust-lang#120112 - matthiaskrgr:rollup-48o3919, r=matth…
7892554 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#119582 (bootstrap: handle vendored sources when remapping crate paths)
 - rust-lang#119730 (docs: fix typos)
 - rust-lang#119828 (Improved collapse_debuginfo attribute, added command-line flag)
 - rust-lang#119869 (replace `track_errors` usages with bubbling up `ErrorGuaranteed`)
 - rust-lang#120037 (Remove `next_root_ty_var`)
 - rust-lang#120094 (tests/ui/asm/inline-syntax: adapt for LLVM 18)
 - rust-lang#120096 (Set RUSTC_BOOTSTRAP=1 consistently)
 - rust-lang#120101 (change `.unwrap()` to `?` on write where `fmt::Result` is returned)
 - rust-lang#120102 (Fix typo in munmap_partial.rs)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 19, 2024
@bors
Auto merge of rust-lang#120112 - matthiaskrgr:rollup-48o3919, r=matth…
92d7277 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#119582 (bootstrap: handle vendored sources when remapping crate paths)
 - rust-lang#119730 (docs: fix typos)
 - rust-lang#119828 (Improved collapse_debuginfo attribute, added command-line flag)
 - rust-lang#119869 (replace `track_errors` usages with bubbling up `ErrorGuaranteed`)
 - rust-lang#120037 (Remove `next_root_ty_var`)
 - rust-lang#120094 (tests/ui/asm/inline-syntax: adapt for LLVM 18)
 - rust-lang#120096 (Set RUSTC_BOOTSTRAP=1 consistently)
 - rust-lang#120101 (change `.unwrap()` to `?` on write where `fmt::Result` is returned)
 - rust-lang#120102 (Fix typo in munmap_partial.rs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c0da80f into rust-lang:master Jan 19, 2024
11 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 19, 2024
@rust-timer
Unrolled build for rust-lang#119828
907a101 
Rollup merge of rust-lang#119828 - azhogin:azhogin/collapse_debuginfo_improved_attr, r=petrochenkov

Improved collapse_debuginfo attribute, added command-line flag

Improved attribute collapse_debuginfo with variants: `#[collapse_debuginfo=(no|external|yes)]`.
Added command-line flag for default behaviour.
Work-in-progress: will add more tests.

cc rust-lang#100758
@petrochenkov petrochenkov mentioned this pull request Feb 12, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

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
Milestone
1.77.0
Development

Successfully merging this pull request may close these issues.
6 participants
@azhogin @rustbot @WaffleLapkin @rust-log-analyzer @bors @petrochenkov