Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply consistent import grouping with cargo fmt and update CI process #92

Merged
merged 1 commit into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions src/input/host_network.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
18 changes: 10 additions & 8 deletions src/input/user_input.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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.";
Expand Down
12 changes: 7 additions & 5 deletions src/input/user_input_comparison.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 6 additions & 4 deletions src/input/user_input_composite.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 8 additions & 6 deletions src/input/user_input_nic.rs
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
6 changes: 4 additions & 2 deletions src/ip_range_input.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
14 changes: 8 additions & 6 deletions src/list/whole/function.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
12 changes: 7 additions & 5 deletions src/list/whole/view.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/modal.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
10 changes: 6 additions & 4 deletions src/notification.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 4 additions & 2 deletions src/pages.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/port_range_input.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
6 changes: 4 additions & 2 deletions src/radio_separate.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
14 changes: 8 additions & 6 deletions src/select/complex/view.rs
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
8 changes: 5 additions & 3 deletions src/select/mini.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 4 additions & 2 deletions src/select/vec_searchable.rs
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
6 changes: 4 additions & 2 deletions src/tab_menu.rs
Original file line number Diff line number Diff line change
@@ -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),
}
Expand Down
6 changes: 4 additions & 2 deletions src/text_input.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
Loading