Skip to content

Commit

Permalink
refactor: Change code-style rule with rustfmt-nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
attakei committed Apr 9, 2024
1 parent 881323c commit 3d08434
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: 'actions/checkout@v4'
- uses: 'Swatinem/rust-cache@v2'
- name: 'Run formatter'
run: cargo fmt --all --check
run: cargo +nightly fmt --all --check
- name: 'Run linter'
run: cargo clippy --workspace --all-targets --all-features --locked
test:
Expand Down
3 changes: 3 additions & 0 deletions .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
group_imports = "StdExternalCrate"
imports_granularity = "Module"
unstable_features = true
6 changes: 3 additions & 3 deletions src/commands/info.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* 'info' command displays data from config-file.
*/
use crate::versioning;
use crate::workspace::Workspace;

use anyhow::Result;
use clap::Args;
use tera::{Context, Tera};

use crate::versioning;
use crate::workspace::Workspace;

#[derive(Args)]
pub(crate) struct Arguments {}

Expand Down
7 changes: 4 additions & 3 deletions src/commands/init.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
use crate::config;
use crate::config::age_toml;
use anyhow::{anyhow, Result};
use std::env::current_dir;
use std::fs::File;
use std::io::prelude::*;

use anyhow::{anyhow, Result};
use clap::Args;
use tera::{Context, Tera};

use crate::config;
use crate::config::age_toml;

const TEMPLATE_BASE: &'static str = r#"
current_version = "{{ current_version }}"
Expand Down
5 changes: 3 additions & 2 deletions src/commands/major.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use crate::versioning::up_major;
use crate::workspace::{make_context, Workspace};
use anyhow::Result;
use clap::Args;

use crate::versioning::up_major;
use crate::workspace::{make_context, Workspace};

#[derive(Args)]
pub(crate) struct Arguments {}

Expand Down
5 changes: 3 additions & 2 deletions src/commands/minor.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use crate::versioning::up_minor;
use crate::workspace::{make_context, Workspace};
use anyhow::Result;
use clap::Args;

use crate::versioning::up_minor;
use crate::workspace::{make_context, Workspace};

#[derive(Args)]
pub(crate) struct Arguments {}

Expand Down
5 changes: 3 additions & 2 deletions src/commands/patch.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use crate::versioning::up_patch;
use crate::workspace::{make_context, Workspace};
use anyhow::Result;
use clap::Args;

use crate::versioning::up_patch;
use crate::workspace::{make_context, Workspace};

#[derive(Args)]
pub(crate) struct Arguments {}

Expand Down
3 changes: 2 additions & 1 deletion src/commands/update.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use crate::workspace::{make_context, Workspace};
use anyhow::Result;
use clap::Args;
use semver::Version;

use crate::workspace::{make_context, Workspace};

#[derive(Args)]
pub(crate) struct Arguments {
new_version: Version,
Expand Down
3 changes: 2 additions & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// Configuration manager.

use std::path::PathBuf;

use anyhow::{anyhow, Result};
use log::info;
use semver::Version;
use serde::{Deserialize, Serialize};
use std::path::PathBuf;

pub mod age_toml;
mod cargo_toml;
Expand Down
3 changes: 2 additions & 1 deletion src/config/age_toml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use std::io::prelude::*;
use std::path::PathBuf;

use anyhow::{anyhow, Result};
use toml_edit::{de::from_document, value, DocumentMut};
use toml_edit::de::from_document;
use toml_edit::{value, DocumentMut};

use super::{Config, ParseAvailable};

Expand Down
3 changes: 2 additions & 1 deletion src/config/cargo_toml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use std::io::prelude::*;
use std::path::PathBuf;

use anyhow::{anyhow, Result};
use toml::{de::Error, Table};
use toml::de::Error;
use toml::Table;
use toml_edit::{value, DocumentMut};

use super::{Config, ParseAvailable};
Expand Down
3 changes: 2 additions & 1 deletion src/config/pyproject_toml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use std::io::prelude::*;
use std::path::PathBuf;

use anyhow::{anyhow, Result};
use toml::{de::Error, Table};
use toml::de::Error;
use toml::Table;
use toml_edit::{value, DocumentMut};

use super::{Config, ParseAvailable};
Expand Down
3 changes: 2 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// Entry point.
use crate::commands::run_command;

mod commands;
mod config;
mod versioning;
mod workspace;
mod writer;
use crate::commands::run_command;

fn main() {
env_logger::init();
Expand Down
3 changes: 2 additions & 1 deletion src/workspace.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use std::path::PathBuf;

use anyhow::{anyhow, Result};
use chrono::{DateTime, Local};
use log::debug;
use semver::Version;
use std::path::PathBuf;

use crate::config::{resolve_config, Config, ConfigDocument};
use crate::writer::Writer;
Expand Down
4 changes: 2 additions & 2 deletions src/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ impl WriteRule {

#[cfg(test)]
mod tests {
use super::*;

use semver::Version;

use super::*;

#[test]
fn new_writer() {
let ctx = Context::new();
Expand Down

0 comments on commit 3d08434

Please sign in to comment.