Skip to content

Remove rustc-workspace-hack - #2916

Merged
bors merged 1 commit into
rust-lang:masterfrom
ehuss:remove-workspace-hack
Jun 4, 2023
Merged

Remove rustc-workspace-hack#2916
bors merged 1 commit into
rust-lang:masterfrom
ehuss:remove-workspace-hack

Conversation

@ehuss

@ehuss ehuss commented Jun 4, 2023

Copy link
Copy Markdown
Contributor

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

@RalfJung

RalfJung commented Jun 4, 2023

Copy link
Copy Markdown
Member

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
ehuss force-pushed the remove-workspace-hack branch from c998cc2 to 54b5e33 Compare June 4, 2023 16:17
@ehuss

ehuss commented Jun 4, 2023

Copy link
Copy Markdown
Contributor Author

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

RalfJung commented Jun 4, 2023

Copy link
Copy Markdown
Member

Ah, fair.

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

@ehuss

ehuss commented Jun 4, 2023

Copy link
Copy Markdown
Contributor Author

The lock should be updated now.

@ehuss
ehuss force-pushed the remove-workspace-hack branch from 54b5e33 to f089f76 Compare June 4, 2023 16:22
@RalfJung

RalfJung commented Jun 4, 2023

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 4, 2023

Copy link
Copy Markdown
Contributor

📌 Commit f089f76 has been approved by RalfJung

It is now in the queue for this repository.

@bors

bors commented Jun 4, 2023

Copy link
Copy Markdown
Contributor

⌛ Testing commit f089f76 with merge 9fa049f...

@bors

bors commented Jun 4, 2023

Copy link
Copy Markdown
Contributor

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

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

3 participants