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

Remove rustc-workspace-hack #2916

Merged
merged 1 commit into from Jun 4, 2023
Merged

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 4, 2023

The rustc-workspace-hack dependency was removed in rust-lang/rust#109133 and should no longer be needed.

@RalfJung
Copy link
Member

RalfJung commented Jun 4, 2023

This sounds like a PR that would be better to land in rustc first, not in the subrepo? That's where it will lead to build errors if things go wrong, after all.

@ehuss
Copy link
Contributor Author

ehuss commented Jun 4, 2023

I can do it there if you want, but I don't suspect there will be any issues. rustc-workspace-hack is an empty dependency with no dependencies itself (it really is a no-op). All the support infrastructure in rust-lang/rust has been removed.

@RalfJung
Copy link
Member

RalfJung commented Jun 4, 2023

Ah, fair.

cargo-miri/Cargo.lock will probably also need updating.

@ehuss
Copy link
Contributor Author

ehuss commented Jun 4, 2023

The lock should be updated now.

@RalfJung
Copy link
Member

RalfJung commented Jun 4, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 4, 2023

📌 Commit f089f76 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jun 4, 2023

⌛ Testing commit f089f76 with merge 9fa049f...

@bors
Copy link
Collaborator

bors commented Jun 4, 2023

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 9fa049f to master...

@bors bors merged commit 9fa049f into rust-lang:master Jun 4, 2023
5 checks passed
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.

None yet

3 participants