#9386: Include the rustfmt.toml when generating the node-template #9449
Conversation
|
User @ericjmiller, please sign the CLA here. |
|
|
||
| update_top_level_cargo_toml(&mut cargo_toml, workspace_members, &node_template_path); | ||
| } | ||
|
|
||
| write_cargo_toml(&t, cargo_toml); | ||
| }); | ||
|
|
||
| // ensures rustfmt is consistent across repositories. | ||
| let node_template_rustfmt_toml_path = node_template_path.join("rustfmt.toml"); | ||
| let rustfmt_target = Path::new("../../rustfmt.toml"); |
There was a problem hiding this comment.
This needs to be relative to options.node_template
There was a problem hiding this comment.
Thanks, @bkchr. Perhaps I misunderstand the issue here.
I thought the options.node_template didn't have the canonical rustfmt.toml and therefore required the Substrate repo's rustfmt.toml. In which case, there isn't a guaranteed way to get to the substrate/rustfmt.toml from the options.node_template path.
There was a problem hiding this comment.
Okay, I believe I understand my confusion. When node-template is referenced in this issue, it's speaking of bin/node-template and therefore exists in this repo. I mistakenly thought it was the devhub node-tempate from another (related) repo passed in as an argument.
Running some QA on the fix and will commit soon.
…b.com/ericjmiller/substrate into include-rustfmt.toml-in-node-template
ericjmiller
requested review from
andresilva,
athei and
kianenigma
as code owners
|
@ericjmiller can you please merge master again. You seem to have fucked up something 😬 |
ericjmiller
force-pushed
the
include-rustfmt.toml-in-node-template
branch
from
ca02c51
to
6acbc73
Compare
|
No idea what's going on. My local repo looks fine, then I push to remote and see the large quantity of changes in the PR. very confusing. I may have to just destroy this and recreate. |
Fixes #9386
Description
The node template generator now adds the Substrate
rustfmt.tomlat the root level.Oh, and I couldn't resist running
rustfmton this file.Important
I used relative pathing to locate the Substrate
rustfmt.toml. Otherwise, it's simple and straightforward.