Skip to content

Provide more context for rustc +nightly -Zunstable-options on stable - #112692

Merged
bors merged 1 commit into
rust-lang:masterfrom
jieyouxu:better-err-msg-for-unstable-options
Jun 28, 2023
Merged

Provide more context for rustc +nightly -Zunstable-options on stable#112692
bors merged 1 commit into
rust-lang:masterfrom
jieyouxu:better-err-msg-for-unstable-options

Conversation

@jieyouxu

@jieyouxujieyouxu commented Jun 16, 2023

Copy link
Copy Markdown
Member
Screenshot 2023-06-16 123456

Closes#110090.

@rustbot

rustbot commented Jun 16, 2023

Copy link
Copy Markdown
Collaborator

r? @davidtwco

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

@rustbotrustbot 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 16, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from cc456df to facd1d3CompareJune 16, 2023 05:02
@rustbot

rustbot commented Jun 16, 2023

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

The Miri subtree was changed

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from facd1d3 to 7de7085CompareJune 16, 2023 05:14
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from 7de7085 to 5bb6338CompareJune 16, 2023 05:22
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from 5bb6338 to 401c241CompareJune 16, 2023 05:33
@rustbot

rustbot commented Jun 16, 2023

Copy link
Copy Markdown
Collaborator

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch 3 times, most recently from b71f9aa to ca7e0b3CompareJune 16, 2023 05:54
@rust-log-analyzer

This comment has been minimized.

Sign in to view
RalfJung
RalfJung reviewed Jun 16, 2023
View reviewed changes
Comment threadsrc/tools/miri/src/bin/miri.rs Outdated

@RalfJungRalfJungJun 16, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is it expected that a second handler gets created here? That seems odd and doesn't seem to happen with the other tools.

@jieyouxujieyouxuJun 16, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is not intentional and I think it was just a leftover from me trying to change stuff.

@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from ca7e0b3 to d8fe6d9CompareJune 16, 2023 07:44
RalfJung
RalfJung reviewed Jun 16, 2023
View reviewed changes
Comment threadsrc/tools/miri/src/bin/miri.rs Outdated

@RalfJungRalfJungJun 16, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Instead of changing the signature of after_analysis for everyone, it would be better to just add the handler reference as a field in MiriCompilerCalls.

How does this even build currently? You haven't changed the call sites.

@jieyouxujieyouxuJun 16, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

This is a bit awkward if I try to add it as a field to MiriCompilerCalls since the inner handle of handler isn't Sync.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from d8fe6d9 to ad32acfCompareJune 16, 2023 08:40
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from ad32acf to 13e3c05CompareJune 16, 2023 09:03
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from 13e3c05 to 826b97aCompareJune 16, 2023 09:41
@bors

bors commented Jun 22, 2023

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #112913) made this pull request unmergeable. Please resolve the merge conflicts.

@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from 826b97a to 54fe071CompareJune 22, 2023 21:57
davidtwco
davidtwco approved these changes Jun 27, 2023
View reviewed changes

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, r=me with the nit below

Comment threadcompiler/rustc_session/src/session.rs Outdated
@jieyouxu
jieyouxuforce-pushed the better-err-msg-for-unstable-options branch from 54fe071 to cef812bCompareJune 27, 2023 15:23
@davidtwco

davidtwco commented Jun 27, 2023

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 27, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit cef812b has been approved by davidtwco

It is now in the queue for this repository.

@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 Jun 27, 2023
@matthiaskrgrmatthiaskrgr mentioned this pull request Jun 27, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2023
@bors
Auto merge ofrust-lang#113105- matthiaskrgr:rollup-rci0uym, r=matth…
6b46c99
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#112207 (Add trustzone and virtualization target features for aarch32.)
- rust-lang#112454 (Make compiletest aware of targets without dynamic linking)
- rust-lang#112628 (Allow comparing `Box`es with different allocators)
- rust-lang#112692 (Provide more context for `rustc +nightly -Zunstable-options` on stable)
- rust-lang#112972 (Make `UnwindAction::Continue` explicit in MIR dump)
- rust-lang#113020 (Add tests impl via obj unless denied)
- rust-lang#113084 (Simplify some conditions)
- rust-lang#113103 (Normalize types when applying uninhabited predicate.)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit b6144cd into rust-lang:masterJun 28, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 28, 2023
@Kobzol

Kobzol commented Jun 28, 2023

Copy link
Copy Markdown
Member

(probably) this PR has regressed coloring of warnings emitted by rustc, and it no longer prints the warning summary at the end.
5ea66686467d3ec5f8c81570e7f0f16ad8dd8cc3 (previous master):

$ rm -rf target && RUSTFLAGS="-Cremark=foo" cargo +5ea66686467d3ec5f8c81570e7f0f16ad8dd8cc3 build --release

image

6b46c996e1d3a07dd73beb2873d74a8a0458d05f (merge containing this PR):

$ rm -rf target && RUSTFLAGS="-Cremark=foo" cargo +6b46c996e1d3a07dd73beb2873d74a8a0458d05f build --release

image

Both commands were executed on a cargo new hello world crate.

@jieyouxu

jieyouxu commented Jun 28, 2023

Copy link
Copy Markdown
MemberAuthor

(probably) this PR has regressed coloring of warnings emitted by rustc, and it no longer prints the warning summary at the end. 5ea66686467d3ec5f8c81570e7f0f16ad8dd8cc3 (previous master):

Thanks for the notice, I will investigate now.

@jieyouxu

jieyouxu commented Jun 28, 2023

Copy link
Copy Markdown
MemberAuthor

The fix is trivial... I forgot to handler.abort_if_error_and_set_error_format(error_format);as soon as we have a usable error format in build_session_options. I set it too late.

@jieyouxujieyouxu mentioned this pull request Jun 28, 2023
Merged
@jieyouxu

jieyouxu commented Jun 28, 2023

Copy link
Copy Markdown
MemberAuthor

(probably) this PR has regressed coloring of warnings emitted by rustc, and it no longer prints the warning summary at the end. 5ea66686467d3ec5f8c81570e7f0f16ad8dd8cc3 (previous master):

Opened #113127 to fix this.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 29, 2023
@matthiaskrgr
Rollup merge ofrust-lang#113127- jieyouxu:fix-error-color-summary, …
4d3a456
…r=davidtwco
Set error handler output format as soon as possible
Should fixrust-lang#112692 (comment).
smoelius added a commit to smoelius/dylint that referenced this pull request Jul 2, 2023
@smoelius
Addressrust-lang/rust#112692
af19510
smoelius added a commit to smoelius/dylint that referenced this pull request Jul 2, 2023
@smoelius
Addressrust-lang/rust#112692
f1de5c8
smoelius added a commit to smoelius/dylint that referenced this pull request Jul 2, 2023
@smoelius
Addressrust-lang/rust#112692
fbd6589
smoelius added a commit to trailofbits/dylint that referenced this pull request Jul 2, 2023
@smoelius
Addressrust-lang/rust#112692
f4094c8
floragru added a commit to floragru/creusot that referenced this pull request Jul 6, 2023
@floragru
fixrust-lang/rust#112692
a4c90a6
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 10, 2023
@bors
Auto merge ofrust-lang#113127- jieyouxu:fix-error-color-summary, r=…
02d1ee4
…davidtwco
Set error handler output format as soon as possible
Should fixrust-lang#112692 (comment).
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Jul 10, 2023
@bors
Auto merge of #113127 - jieyouxu:fix-error-color-summary, r=davidtwco
9fe5b88
Set error handler output format as soon as possible
Should fixrust-lang/rust#112692 (comment).
@jieyouxu
jieyouxu deleted the better-err-msg-for-unstable-options branch December 20, 2024 17:37
Kobzol pushed a commit to Kobzol/portable-simd that referenced this pull request Feb 3, 2026
@bors
Auto merge of #113127 - jieyouxu:fix-error-color-summary, r=davidtwco
d205a2e
Set error handler output format as soon as possible
Should fixrust-lang/rust#112692 (comment).
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
@davidtwcodavidtwcodavidtwco approved these changes

Assignees

@davidtwcodavidtwco

Labels

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.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

stable: Give a better error message for rustc +nightly -Zunstable-options

7 participants

@jieyouxu@rustbot@rust-log-analyzer@bors@davidtwco@Kobzol@RalfJung