Skip to content

internal: Sync from rust #15899

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

Merged
merged 8 commits into from
Nov 15, 2023
Merged

internal: Sync from rust #15899

merged 8 commits into from
Nov 15, 2023

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Nov 15, 2023

No description provided.

lnicola and others added 6 commits September 18, 2023 12:33
They've been deprecated for four years.

This commit includes the following changes.
- It eliminates the `rustc_plugin_impl` crate.
- It changes the language used for lints in
  `compiler/rustc_driver_impl/src/lib.rs` and
  `compiler/rustc_lint/src/context.rs`. External lints are now called
  "loaded" lints, rather than "plugins" to avoid confusion with the old
  plugins. This only has a tiny effect on the output of `-W help`.
- E0457 and E0498 are no longer used.
- E0463 is narrowed, now only relating to unfound crates, not plugins.
- The `plugin` feature was moved from "active" to "removed".
- It removes the entire plugins chapter from the unstable book.
- It removes quite a few tests, mostly all of those in
  `tests/ui-fulldeps/plugin/`.

Closes #29597.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 15, 2023
@lnicola
Copy link
Member Author

lnicola commented Nov 15, 2023

Hold on, I'll try to redo this to get rid of most of the merge commits. For some reason, I end up with hundreds of conflicts when I do it in one go, but only a couple of them if I do it in smaller steps.

@Veykril
Copy link
Member

Veykril commented Nov 15, 2023

Is that because we merged things here while the other sync was going on? I don't remember when we had to pause changes and when not

@lnicola
Copy link
Member Author

lnicola commented Nov 15, 2023

Yes, but yesterday's sync was based off the previous release (Nov 6) and it was such a pain I didn't know it would work in the end, so didn't start again from the one on Nov 13.

For the record, it looks like the best way to merge these back is to do it first up to the release (Nov 6), then merge everything un master. That avoids most conflicts.

@@ -3,6 +3,10 @@
//! Based on cli flags, either spawns an LSP server, or runs a batch analysis

#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
#[cfg(feature = "in-rust-tree")]
Copy link
Member Author

Choose a reason for hiding this comment

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

This either expands to:

#[allow(unused_extern_crates)]
extern crate rustc_driver;

or to nothing, right? At least it still works without the feature enabled.

I should know, but..

Copy link
Member

Choose a reason for hiding this comment

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

yes, the cfg configures the whole annotated item, including its attributes

#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
#![recursion_limit = "128"]
Copy link
Member Author

Choose a reason for hiding this comment

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

Guess we can drop the recursion limit here, 128 is the default.

@Veykril
Copy link
Member

Veykril commented Nov 15, 2023

Yes, but yesterday's sync was based off the previous release (Nov 6) and it was such a pain I didn't know it would work in the end, so didn't start again from the one on Nov 13.

I've been following your struggles there 😅 I feel sorry for anyone working on rustc bootstrap honestly. Thank you so much for dealing with this part of r-a btw 🙇

@lnicola
Copy link
Member Author

lnicola commented Nov 15, 2023

Then I can

@bors r=Veykril

@bors
Copy link
Contributor

bors commented Nov 15, 2023

📌 Commit 6b53c09 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Nov 15, 2023

⌛ Testing commit 6b53c09 with merge f888a6e...

@bors
Copy link
Contributor

bors commented Nov 15, 2023

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing f888a6e to master...

@bors bors merged commit f888a6e into rust-lang:master Nov 15, 2023
@lnicola lnicola deleted the sync-from-rust branch November 15, 2023 08:33
@oxalica
Copy link
Contributor

oxalica commented Nov 15, 2023

Is there a reason why to extern crate rustc_driver although it's unused? I guess there's some context outside this PR?

@lnicola
Copy link
Member Author

lnicola commented Nov 15, 2023

It fails to link without it, like in the downstream sync PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants