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.

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

add missing feature(error_in_core) #114837

Merged
merged 1 commit into from
Aug 15, 2023
Merged

Conversation

RalfJung
Copy link
Member

Needed to fix feature gate errors in https://github.com/rust-lang/miri-test-libstd/actions/runs/5862810459/job/15895203359. I don't know how doctests are passing in-tree without this feature gate...

@rustbot
Copy link
Collaborator

rustbot commented Aug 15, 2023

r? @cuviper

(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-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 15, 2023
@@ -130,6 +130,7 @@ pub trait Error: Debug + Display {
///
/// ```rust
/// #![feature(error_generic_member_access)]
/// #![feature(error_in_core)]
Copy link
Contributor

Choose a reason for hiding this comment

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

Would it make more sense to change the import to std::error::{...}? If we don't do that then stabilization of the error_generic_member_access feature would be unnecessarily dependent on error_in_core, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't have a preference, I assumed these tests were importing core::error for a reason.

If we don't do that then stabilization of the error_generic_member_access feature would be unnecessarily dependent on error_in_core, right?

No, the functions can still be stabilized independently.

Copy link
Member

Choose a reason for hiding this comment

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

These are already a mix of core/std, having impl std::error::Error below, but oh well...

@cuviper
Copy link
Member

cuviper commented Aug 15, 2023

I'm glad you filed #114838 to followup this mystery, otherwise LGTM!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 15, 2023

📌 Commit fb07077 has been approved by cuviper

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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 15, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 15, 2023
add missing feature(error_in_core)

Needed to fix feature gate errors in https://github.com/rust-lang/miri-test-libstd/actions/runs/5862810459/job/15895203359. I don't know how doctests are passing in-tree without this feature gate...
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 15, 2023
add missing feature(error_in_core)

Needed to fix feature gate errors in https://github.com/rust-lang/miri-test-libstd/actions/runs/5862810459/job/15895203359. I don't know how doctests are passing in-tree without this feature gate...
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 15, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#114588 (Improve docs for impl Default for ExitStatus)
 - rust-lang#114619 (Fix pthread_attr_union layout on Wasi)
 - rust-lang#114644 (Point out expectation even if we have `TypeError::RegionsInsufficientlyPolymorphic`)
 - rust-lang#114668 (Deny `FnDef` in patterns)
 - rust-lang#114819 (Point at return type when it influences non-first `match` arm)
 - rust-lang#114826 (Fix typos)
 - rust-lang#114837 (add missing feature(error_in_core))
 - rust-lang#114853 (Migrate GUI colors test to original CSS color format)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a830834 into rust-lang:master Aug 15, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Aug 15, 2023
@RalfJung RalfJung deleted the error_in_core branch August 16, 2023 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library 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