diff --git a/cmd/src/tools/cmd_fmt.ri b/cmd/src/tools/cmd_fmt.ri index 832aa7357..c815ae5b3 100644 --- a/cmd/src/tools/cmd_fmt.ri +++ b/cmd/src/tools/cmd_fmt.ri @@ -35,19 +35,18 @@ public func cmd_fmt(args: []string) -> ! { } for input in remaining { mut prefs_ := prefs.Prefs( - input: input, is_fmt: true, hide_all_warns: true ); prefs_.check_input(input); - prefs_.load_data()!; + prefs_.load_module_info()!; report.reportTable.prefs = prefs_; table_ := ast.Table.new(prefs_); mut compiler := rivet.Compiler(table: table_, prefs: prefs_); compiler.load_root_module()!; mut formatter := fmt.Formatter(prefs_, table_, write_to_file: write_to_file); for source_file in table_.source_files { - output := formatter.fmt(source_file); + output := formatter.format(source_file); console.writeln(output); } } diff --git a/lib/rivet/src/fmt/mod.ri b/lib/rivet/src/fmt/mod.ri index a9e78c8b1..6c45b42f6 100644 --- a/lib/rivet/src/fmt/mod.ri +++ b/lib/rivet/src/fmt/mod.ri @@ -22,7 +22,7 @@ public struct Formatter { mut line_len: uint; mut empty_line: bool; - public func fmt(mut self, source_file: ast.SourceFile) -> string { + public func format(mut self, source_file: ast.SourceFile) -> string { self.source_file = source_file; self.format_decls(source_file.decls); return self.output.to_string(); diff --git a/lib/rivet/src/prefs/mod.ri b/lib/rivet/src/prefs/mod.ri index 6ae0cc451..9e538dd75 100644 --- a/lib/rivet/src/prefs/mod.ri +++ b/lib/rivet/src/prefs/mod.ri @@ -278,7 +278,7 @@ public struct Prefs { if prefs.input.is_empty() { utils.error("no input received"); } - prefs.load_data()!; + prefs.load_module_info()!; return prefs; } @@ -301,7 +301,7 @@ public struct Prefs { } } - public func load_data(mut self) -> ! { + public func load_module_info(mut self) -> ! { if self.is_test { self.mod_output = "_rivet_tests_runner_"; } else if self.mod_output.is_empty() {