Add import grouping config to cargo fmt and CI

aicers · Jun 17, 2024 · dc3efa2 · dc3efa2
1 parent a6dcae2
commit dc3efa2
Show file tree

Hide file tree

Showing 20 changed files with 111 additions and 68 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
         rust-version: stable
     - uses: actions/checkout@v3
     - name: Check formatting
-      run: cargo fmt -- --check
+      run: cargo fmt -- --config group_imports=StdExternalCrate
     - name: Clippy
       run: cargo clippy -- -D warnings -W clippy::pedantic
     - name: markdownlint

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,13 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 - Fixed the wrong directory of delete-x.png file from `frotary`
   to `frontary` in `theme.css`.
 
+### Changed
+
+- Applied `cargo fmt` with `--config group_imports=StdExternalCrate` for
+  consistent import grouping.
+- Updated CI process to include `--config group_imports=StdExternalCrate`
+  with the `cargo fmt -- --check` command for enforcing import grouping rules.
+
 ## [0.9.0] - 2024-04-11
 
 ### Changed

diff --git a/src/input/host_network.rs b/src/input/host_network.rs
@@ -1,13 +1,15 @@
-use crate::{
-    language::Language, parse_host_network, text, HostNetwork, InputHostNetworkGroup, Texts,
-};
-use json_gettext::get_text;
 use std::rc::Rc;
 use std::{cell::RefCell, marker::PhantomData};
+
+use json_gettext::get_text;
 use wasm_bindgen::JsCast;
 use web_sys::{HtmlInputElement, KeyboardEvent};
 use yew::{events::InputEvent, html, Component, Context, Html, Properties, TargetCast};
 
+use crate::{
+    language::Language, parse_host_network, text, HostNetwork, InputHostNetworkGroup, Texts,
+};
+
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum Kind {
     HostOnly,

diff --git a/src/input/user_input.rs b/src/input/user_input.rs
@@ -1,3 +1,13 @@
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::rc::Rc;
+
+use gloo_file::File;
+use json_gettext::get_text;
+use wasm_bindgen::JsCast;
+use web_sys::{Event, HtmlInputElement};
+use yew::{events::InputEvent, html, html::TargetCast, Component, Context, Html};
+
 use super::{
     component::{InvalidMessage, Message, Model},
     InputItem,
@@ -6,14 +16,6 @@ use crate::{
     input::component::Verification, text, HostNetworkHtml, HostNetworkKind, InputEssential, Radio,
     Tag, ViewString,
 };
-use gloo_file::File;
-use json_gettext::get_text;
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::rc::Rc;
-use wasm_bindgen::JsCast;
-use web_sys::{Event, HtmlInputElement};
-use yew::{events::InputEvent, html, html::TargetCast, Component, Context, Html};
 
 const CHANGE_PASSWORD_NOTICE: &str = "If you want to change your password, input a new one.";
 const EXISTING_MSG: &str = "The input already exists.";

diff --git a/src/input/user_input_comparison.rs b/src/input/user_input_comparison.rs
@@ -1,14 +1,16 @@
+use std::{cell::RefCell, collections::HashMap, rc::Rc, str::FromStr};
+
+use json_gettext::get_text;
+use wasm_bindgen::JsCast;
+use web_sys::HtmlInputElement;
+use yew::{events::InputEvent, html, Component, Context, Html};
+
 use super::{
     component::{Message, Model},
     user_input::view_asterisk,
     Comparison, ComparisonKind, InputItem, Value as ComparisonValue, ValueKind,
 };
 use crate::{text, InputEssential, Item, SelectSearchableKind, VecSelect, ViewString};
-use json_gettext::get_text;
-use std::{cell::RefCell, collections::HashMap, rc::Rc, str::FromStr};
-use wasm_bindgen::JsCast;
-use web_sys::HtmlInputElement;
-use yew::{events::InputEvent, html, Component, Context, Html};
 
 impl<T> Model<T>
 where

diff --git a/src/input/user_input_composite.rs b/src/input/user_input_composite.rs
@@ -1,13 +1,15 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use json_gettext::get_text;
+use yew::{classes, html, Component, Context, Html};
+
 use super::{
     component::{Message, Model},
     user_input::{view_asterisk, MAX_PER_LAYER},
     InputItem,
 };
 use crate::{text, CheckBox, CheckStatus, ChildrenPosition, InputEssential, InputType};
-use json_gettext::get_text;
-use std::cell::RefCell;
-use std::rc::Rc;
-use yew::{classes, html, Component, Context, Html};
 
 impl<T> Model<T>
 where

diff --git a/src/input/user_input_nic.rs b/src/input/user_input_nic.rs
@@ -1,15 +1,17 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use json_gettext::get_text;
+use wasm_bindgen::JsCast;
+use web_sys::HtmlInputElement;
+use yew::{classes, events::InputEvent, html, Component, Context, Html};
+
 use super::{
     component::{InvalidMessage, Message, Model},
     user_input::{view_asterisk, MAX_PER_LAYER},
     InputItem,
 };
 use crate::{input::component::Verification, text, InputEssential, InputNic, ViewString};
-use json_gettext::get_text;
-use std::cell::RefCell;
-use std::rc::Rc;
-use wasm_bindgen::JsCast;
-use web_sys::HtmlInputElement;
-use yew::{classes, events::InputEvent, html, Component, Context, Html};
 
 const INTERFACE_NOTICE: &str = "x.x.x.x/x";
 const GATEWAY_NOTICE: &str = "x.x.x.x";

diff --git a/src/ip_range_input.rs b/src/ip_range_input.rs
@@ -1,10 +1,12 @@
-use crate::{input::view_asterisk, language::Language, text, IpRange, Texts};
-use json_gettext::get_text;
 use std::{cell::RefCell, net::Ipv4Addr, rc::Rc, str::FromStr};
+
+use json_gettext::get_text;
 use wasm_bindgen::JsCast;
 use web_sys::HtmlInputElement;
 use yew::{html, Component, Context, Html, InputEvent, Properties};
 
+use crate::{input::view_asterisk, language::Language, text, IpRange, Texts};
+
 const DEFAULT_MAX_HEIGHT: u32 = 280;
 
 #[derive(Clone, PartialEq, Eq)]

diff --git a/src/list/whole/function.rs b/src/list/whole/function.rs
@@ -1,15 +1,17 @@
-use super::{component::SortListKind, Message, Model, SortColumn, ViewInputStatus};
-use crate::{
-    list::{DataType, Kind},
-    {CheckStatus, PagesInfo, SortStatus},
-};
-use chrono::{DateTime, Utc};
 use std::cell::RefCell;
 use std::collections::hash_map::Entry::Vacant;
 use std::collections::HashSet;
 use std::rc::Rc;
+
+use chrono::{DateTime, Utc};
 use yew::{Component, Context};
 
+use super::{component::SortListKind, Message, Model, SortColumn, ViewInputStatus};
+use crate::{
+    list::{DataType, Kind},
+    {CheckStatus, PagesInfo, SortStatus},
+};
+
 impl<T> Model<T>
 where
     T: Clone + Component + PartialEq,

diff --git a/src/list/whole/view.rs b/src/list/whole/view.rs
@@ -1,3 +1,10 @@
+use std::collections::HashMap;
+use std::rc::Rc;
+
+use htmlescape::decode_html;
+use json_gettext::get_text;
+use yew::{classes, html, Component, Context, Html};
+
 use super::{
     component::{Message, Model},
     DEFAULT_NUM_PAGES,
@@ -7,11 +14,6 @@ use crate::{
     text, CheckBox, CheckStatus, InputType, MoreAction, Pages, SelectMini, SelectMiniKind, Sort,
     SortStatus, ViewString, WholeList, NBSP,
 };
-use htmlescape::decode_html;
-use json_gettext::get_text;
-use std::collections::HashMap;
-use std::rc::Rc;
-use yew::{classes, html, Component, Context, Html};
 
 impl<T> Model<T>
 where

diff --git a/src/modal.rs b/src/modal.rs
@@ -1,8 +1,10 @@
-use crate::{language::Language, text, Texts};
-use json_gettext::get_text;
 use std::{marker::PhantomData, rc::Rc};
+
+use json_gettext::get_text;
 use yew::{classes, html, Component, Context, Html, Properties};
 
+use crate::{language::Language, text, Texts};
+
 const MAX_HEIGHT: u32 = 700;
 const DEFAULT_MIN_HEIGHT: u32 = 306;
 const DEFAULT_WIDTH: u32 = 714;

diff --git a/src/notification.rs b/src/notification.rs
@@ -1,14 +1,16 @@
-use crate::{language::Language, text, window_inner_height, Texts};
-use gloo_timers::callback::Timeout;
-use json_gettext::get_text;
-use num_traits::ToPrimitive;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::fmt::Write;
 use std::rc::Rc;
 use std::time::Duration;
+
+use gloo_timers::callback::Timeout;
+use json_gettext::get_text;
+use num_traits::ToPrimitive;
 use yew::{html, Component, Context, Html, Properties};
 
+use crate::{language::Language, text, window_inner_height, Texts};
+
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub enum Category {
     Fail,

diff --git a/src/pages.rs b/src/pages.rs
@@ -1,12 +1,14 @@
-use crate::{language::Language, text, Texts};
-use json_gettext::get_text;
 use std::rc::Rc;
 use std::str::FromStr;
 use std::{cell::RefCell, marker::PhantomData};
+
+use json_gettext::get_text;
 use wasm_bindgen::JsCast;
 use web_sys::{HtmlInputElement, KeyboardEvent};
 use yew::{events::InputEvent, html, Component, Context, Html, Properties};
 
+use crate::{language::Language, text, Texts};
+
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub struct Info {
     // starts at 1

diff --git a/src/port_range_input.rs b/src/port_range_input.rs
@@ -1,9 +1,11 @@
-use crate::{input::view_asterisk, language::Language, text, Texts};
-use json_gettext::get_text;
 use std::{cell::RefCell, rc::Rc, str::FromStr};
+
+use json_gettext::get_text;
 use wasm_bindgen::JsCast;
 use web_sys::HtmlInputElement;
 use yew::{html, Component, Context, Html, InputEvent, Properties};
+
+use crate::{input::view_asterisk, language::Language, text, Texts};
 const DEFAULT_MAX_HEIGHT: u32 = 280;
 
 #[derive(Clone, PartialEq, Eq)]

diff --git a/src/radio_separate.rs b/src/radio_separate.rs
@@ -1,9 +1,11 @@
-use crate::{language::Language, text, Texts, ViewString};
-use json_gettext::get_text;
 use std::rc::Rc;
 use std::{cell::RefCell, marker::PhantomData};
+
+use json_gettext::get_text;
 use yew::{html, Component, Context, Html, Properties};
 
+use crate::{language::Language, text, Texts, ViewString};
+
 #[derive(Copy, Clone, PartialEq, Eq)]
 pub enum Message {
     ClickItem,

diff --git a/src/select/complex/view.rs b/src/select/complex/view.rs
@@ -1,15 +1,17 @@
-use super::{Message, Model, MIN_POP_HEIGHT};
-use crate::{
-    text, window_inner_height, CheckBox, CheckStatus, EndpointKind, NetworkItem, SelectComplexKind,
-    SelectMini, SelectMiniKind, SelectionExtraInfo, ViewString, NBSP,
-};
+use std::rc::Rc;
+
 use htmlescape::decode_html;
 use json_gettext::get_text;
-use std::rc::Rc;
 use wasm_bindgen::JsCast;
 use web_sys::{HtmlInputElement, KeyboardEvent};
 use yew::{events::InputEvent, html, Context, Html};
 
+use super::{Message, Model, MIN_POP_HEIGHT};
+use crate::{
+    text, window_inner_height, CheckBox, CheckStatus, EndpointKind, NetworkItem, SelectComplexKind,
+    SelectMini, SelectMiniKind, SelectionExtraInfo, ViewString, NBSP,
+};
+
 impl Model {
     pub(super) fn view_pop(&self, ctx: &Context<Self>) -> Html {
         let txt = ctx.props().txt.txt.clone();

diff --git a/src/select/mini.rs b/src/select/mini.rs
@@ -1,12 +1,14 @@
-use crate::{language::Language, text, toggle_visibility, Texts, ViewString};
-use gloo_events::EventListener;
-use json_gettext::get_text;
 use std::rc::Rc;
 use std::{cell::RefCell, marker::PhantomData};
+
+use gloo_events::EventListener;
+use json_gettext::get_text;
 use web_sys::{Event, HtmlElement};
 use yew::virtual_dom::AttrValue;
 use yew::{classes, html, Component, Context, Html, NodeRef, Properties};
 
+use crate::{language::Language, text, toggle_visibility, Texts, ViewString};
+
 pub struct Model<T, U> {
     click_listener: Option<EventListener>,
     click_count: usize,

diff --git a/src/select/vec_searchable.rs b/src/select/vec_searchable.rs
@@ -1,11 +1,13 @@
-use super::searchable::DEFAULT_SIZED_VALUE;
-use crate::{language::Language, Item, SelectSearchable, SelectSearchableKind, Texts};
 use std::collections::{HashMap, HashSet};
 use std::rc::Rc;
 use std::{cell::RefCell, marker::PhantomData};
+
 use yew::virtual_dom::AttrValue;
 use yew::{html, Component, Context, Html, Properties};
 
+use super::searchable::DEFAULT_SIZED_VALUE;
+use crate::{language::Language, Item, SelectSearchable, SelectSearchableKind, Texts};
+
 #[derive(Clone, PartialEq, Eq)]
 pub enum Message {
     Select(usize),

diff --git a/src/tab_menu.rs b/src/tab_menu.rs
@@ -1,8 +1,10 @@
-use crate::{language::Language, text, Texts};
-use json_gettext::get_text;
 use std::{marker::PhantomData, rc::Rc};
+
+use json_gettext::get_text;
 use yew::{classes, html, Component, Context, Html, Properties};
 
+use crate::{language::Language, text, Texts};
+
 pub enum Message {
     ClickMenu(usize),
 }

diff --git a/src/text_input.rs b/src/text_input.rs
@@ -1,10 +1,12 @@
-use crate::{input::view_asterisk, language::Language, text, Texts};
-use json_gettext::get_text;
 use std::cell::RefCell;
 use std::rc::Rc;
+
+use json_gettext::get_text;
 use wasm_bindgen::JsCast;
 use web_sys::HtmlInputElement;
 use yew::{html, Component, Context, Html, InputEvent, Properties};
+
+use crate::{input::view_asterisk, language::Language, text, Texts};
 const DEFAULT_MAX_HEIGHT: u32 = 280;
 
 #[derive(Clone, PartialEq, Eq)]