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

feat: Implement per-edition preludes #9097

Merged
merged 1 commit into from
Jun 1, 2021
Merged

feat: Implement per-edition preludes #9097

merged 1 commit into from
Jun 1, 2021

Conversation

jonas-schievink
Copy link
Contributor

Part of #9056

Our previous implementation was incorrect (presumably because of the misleading comment in libstd here). #[prelude_import] does not define the prelude, it can only override the implicit prelude for the current crate.

This PR fixes that, which also makes the prelude imports in rustc_span work. Closes #8815.

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 1, 2021

@bors bors bot merged commit 4f63e79 into rust-lang:master Jun 1, 2021
@jonas-schievink jonas-schievink deleted the 2021-prelude branch June 1, 2021 11:56
bors bot added a commit to intellij-rust/intellij-rust that referenced this pull request Sep 10, 2021
7809: RES: Fix injecting prelude in 2021 edition r=Undin a=dima74

Fixes #7796

Related: rust-lang/rust-analyzer#9097

changelog: Use correct prelude for 2021 edition


Co-authored-by: Dmitry Murzin <diralik@yandex.ru>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prelude not imported in rustc_span
1 participant