diff options
| author | Mads Hougesen <mads@mhouge.dk> | 2024-05-13 19:23:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-13 11:23:40 -0600 |
| commit | b52d462cb7bea5e81174ece43eb349357add2f11 (patch) | |
| tree | 4e0b9e91d6503846d3d8b7c6edbc517740e370f1 /lua/conform/formatters/rustfmt.lua | |
| parent | 40faaa8fdd0b7f98f58070943306fd93abb5caad (diff) | |
feat: add support for yew-fmt (#398)
* feat: add support for yew-fmt
Should close #314 :)
* refactor: copy rustfmt to yew-fmt
* fix: use correct default_edition
* refactor: extract Cargo.toml parsing into utility function
* refactor: yew-fmt doesn't rely directly on rustfmt definition
---------
Co-authored-by: Steven Arcangeli <stevearc@stevearc.com>
Diffstat (limited to 'lua/conform/formatters/rustfmt.lua')
| -rw-r--r-- | lua/conform/formatters/rustfmt.lua | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/lua/conform/formatters/rustfmt.lua b/lua/conform/formatters/rustfmt.lua index 62d2d78..e33fb86 100644 --- a/lua/conform/formatters/rustfmt.lua +++ b/lua/conform/formatters/rustfmt.lua @@ -1,15 +1,4 @@ ----@param manifest string ----@return nil|string -local function parse_edition(manifest) - for line in io.lines(manifest) do - if line:match("^edition *=") then - local edition = line:match("%d+") - if edition then - return edition - end - end - end -end +local util = require("conform.util") ---@type conform.FileFormatterConfig return { @@ -24,14 +13,7 @@ return { }, args = function(self, ctx) local args = { "--emit=stdout" } - local edition - local manifest = vim.fs.find("Cargo.toml", { upward = true, path = ctx.dirname })[1] - if manifest then - edition = parse_edition(manifest) - end - if not edition then - edition = self.options.default_edition - end + local edition = util.parse_rust_edition(ctx.dirname) or self.options.default_edition table.insert(args, "--edition=" .. edition) return args |