Format the codebase via rustfmt #263
Merged
Conversation
This file contains 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
This is just the result of running `cargo fmt`. Unfortunately, quite a few changes are necessary as `rustfmt` wasn't used for quite a while. We'll add a CI check to enforce that the code is properly formatted. Signed-off-by: Michael Weiss <[email protected]>
To enforce a consistent formatting of the code based on the official `rustfmt` code formatting tool (and custom settings in `rustfmt.toml`). Signed-off-by: Michael Weiss <[email protected]>
primeos-work
commented
Jul 11, 2023
| @@ -1264,7 +1265,8 @@ fn arg_older_than_date(about: &str) -> Arg { | |||
| months, month, M -- defined as 30.44 days | |||
| years, year, y -- defined as 365.25 days | |||
|
|
|||
| "#) | |||
| "#, | |||
| ) | |||
There was a problem hiding this comment.
This change isn't ideal... :(
primeos-work
commented
Jul 11, 2023
Comment on lines
-350
to
+389
| writeln!(outlock, "For Package: {p} {v}", | ||
| writeln!( | ||
| outlock, | ||
| "For Package: {p} {v}", | ||
| p = mkgreen(&db_package.name), | ||
| v = mkgreen(&db_package.version))?; | ||
| v = mkgreen(&db_package.version) | ||
| )?; |
There was a problem hiding this comment.
This destroys the manual formatting but IMO it's fine
primeos-work
commented
Jul 11, 2023
Comment on lines
491
to
493
| let hdrs = crate::commands::util::mk_header(vec![ | ||
| "Submit", | ||
| "Job", | ||
| "Time", | ||
| "Host", | ||
| "Ok?", | ||
| "Package", | ||
| "Version", | ||
| "Distro", | ||
| "Submit", "Job", "Time", "Host", "Ok?", "Package", "Version", "Distro", | ||
| ]); |
There was a problem hiding this comment.
This'll produce another "large" diff if we extend the vector but I guess that's acceptable (at least it's consistent (based on the length)).
primeos-work
commented
Jul 11, 2023
Comment on lines
+319
to
+340
| d.config | ||
| .exposed_ports | ||
| .map(|hm| { | ||
| let s = hm | ||
| .iter() | ||
| .map(|(k, v_hm)| { | ||
| format!( | ||
| "{:ind$}{k}:\n{hm}", | ||
| "", | ||
| ind = 8, | ||
| k = k, | ||
| hm = v_hm | ||
| .iter() | ||
| .map(|(k, v)| format!( | ||
| "{:ind$}{k}: {v}", | ||
| "", | ||
| ind = 12, | ||
| k = k, | ||
| v = v | ||
| )) | ||
| .collect::<Vec<_>>() | ||
| .join("\n") |
There was a problem hiding this comment.
Ouch... That might deserve a rewrite :D (s. also the other parts in this file)
primeos-work
commented
Jul 11, 2023
Comment on lines
66
to
69
| .values(&new_submit) | ||
|
|
||
| // required because if we re-use the staging store, we do not create a new UUID but re-use the old one | ||
| .on_conflict_do_nothing() | ||
|
|
||
| .execute(conn) |
There was a problem hiding this comment.
Not ideal but it should still be clear that the comment belongs to the next line.
primeos-work
commented
Jul 11, 2023
Comment on lines
-46
to
+53
| LogItem::Line(l) => { | ||
| LogItem::Line(l) => { | ||
| let s = std::str::from_utf8(l).unwrap_or("ERROR UTF8 ENCODING"); | ||
| writeln!(f, "[{i}] Line('{s}')")? | ||
| }, | ||
| LogItem::Progress(u) => writeln!(f, "[{i}] Progress({u})")?, | ||
| } | ||
| LogItem::Progress(u) => writeln!(f, "[{i}] Progress({u})")?, | ||
| LogItem::CurrentPhase(s) => writeln!(f, "[{i}] Phase({s})")?, | ||
| LogItem::State(Ok(_)) => writeln!(f, "[{i}] State::OK")?, | ||
| LogItem::State(Err(_)) => writeln!(f, "[{i}] State::Err")?, | ||
| LogItem::State(Ok(_)) => writeln!(f, "[{i}] State::OK")?, | ||
| LogItem::State(Err(_)) => writeln!(f, "[{i}] State::Err")?, |
There was a problem hiding this comment.
I'm not a fan of such alignments so this is fine with me :)
(The alignments look pretty but I don't like their impact on diffs + they're annoying to maintain, unless it's automated by the IDE/editor/formatter)
Merged
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.
The first commit is the result of
cargo fmtand the second commit adds a CI check to ensure that we won't run into this "problem" again. This PR is quite overdue (I delayed it to avoid unnecessary conflicts with other active/open PRs (especially #132)).The first commit also contains a small manual change as running
cargo fmtresulted in the following regression:We could also consider overriding some
rustfmtsettings (https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=) to reduce the size of the diff / avoid somewhat "unnecessary" changes.