Fixes to rust-toolchain.toml handling
#1225
Merged
+9
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Two .gitignore files and a GitHub workflow referenced `rust-toolchain` without a `.toml` extension, but all the files in the repo and the generated files are `rust-toolchain.toml`. In addition, have the GitHub workflow's hashing take `*rust-toolchain.toml` into account, to allow for a future split between the toolchain for compiling c2rust and the toolchain for compiling c2rust-generated code that needs nightly.
…in.toml` When c2rust-transpile translates C variadics, it generates code using the (currently) nightly-only feature `c_variadics`, so it emits a `rust-toolchain.toml` file to use nightly. Rather than copy this file from the `rust-toolchain.toml` used to build c2rust itself, use a separate file. This also means the generated `rust-toolchain.toml` can stop requiring toolchain components that the generated code doesn't need, such as rustc-dev. (It still requires `rustfmt`, as c2rust may run `cargo fmt` on the generated code if invoking `c2rust-refactor`.)
kkysen
changed the title
rust-toolchain.toml handling
What do you mean by this? |
|
Oh by the way, there are still a few uses of |
I mean the implementation of #1220 : attempting to build only the tools needing rustc internals with the nightly toolchain, and the rest with the stable toolchain. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a few aspects of the
rust-toolchain.tomlhandling, to make it easier to make future changes such as limiting the use ofrust-toolchain.tomlto the tools that use rustc internals.Fix a few obsolete references to
rust-toolchainrather thanrust-toolchain.toml, since c2rust doesn't use the former.Use the
rustfmtcomponent rather thanrustfmt-preview, since the latter is obsolete (rustfmt has not been a "preview" for a long time).Finally, make
c2rust-transpileuse a separate file for the generatedrust-toolchain.toml. When c2rust-transpile translates C variadics, it generates code using the (currently) nightly-only featurec_variadics, so it emits arust-toolchain.tomlfile to use nightly. Rather than copy this filefrom the
rust-toolchain.tomlused to build c2rust itself, use a separate file.This also means the generated
rust-toolchain.tomlcan stop requiring toolchain components that the generated code doesn't need, such as rustc-dev. (It still requiresrustfmt, as c2rust may runcargo fmton the generated code if invokingc2rust-refactor.)