Skip to content

Remove not applicable rustc patch #234

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 2 commits into from
Oct 17, 2022

Conversation

paulcacheux
Copy link
Contributor

@paulcacheux paulcacheux commented Oct 15, 2022

Currently the CI displays:

2022-10-15T14:12:46.1306418Z HEAD is now at 7480389611f Auto merge of #100911 - tmiasko:update-stdarch, r=Amanieu
2022-10-15T14:12:46.1313753Z error: patch failed: src/tools/compiletest/src/header.rs:806
2022-10-15T14:12:46.1330234Z ##[error]error: src/tools/compiletest/src/header.rs: patch does not apply

This is because the rustc patch is no longer necessary.
This PR fixes this by simply removing the patch. Happy to remove the whole directory if desired (instead of the current .gitkeep solution).

This seems related to #197

@paulcacheux paulcacheux marked this pull request as ready for review October 15, 2022 15:46
@antoyo
Copy link
Contributor

antoyo commented Oct 16, 2022

Thanks for this PR.

I cannot remember why exactly that patch was needed and I'm not sure whether we'll need more patches like this in the future, so please remove the .gitkeep file.

@paulcacheux
Copy link
Contributor Author

Great, the directory was removed in the last commit

@antoyo antoyo merged commit 618553b into rust-lang:master Oct 17, 2022
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.

2 participants