refactor: refactor things with Clippy's help

Merge branch 'refactor/clippy' of https://gitea.treehouse.systems/fortressia/echidna

See #23
fix/panic_format
Nefo Fortressia 2021-12-27 20:59:09 +07:00
commit f785463540
Signed by: fortressia
GPG Key ID: 6D7972CC76174995
7 changed files with 50 additions and 42 deletions

View File

@ -1 +0,0 @@
"clippy::style" = "deny"

View File

@ -21,8 +21,8 @@ impl EchidnaCoreEditor {
// Without cloning it, for some reasons the Rust compiler complains about &this.to_imp().sourceview not being IsA<sourceview::View>
this_imp.minimap.set_view(&this_imp.sourceview.clone());
if file.is_some() {
let file = file.unwrap();
match file {
Some(file) => {
let file_location = file
.location()
.expect("file is required to have a location");
@ -73,6 +73,8 @@ impl EchidnaCoreEditor {
);
}
}
None => {}
}
this
}

View File

@ -15,3 +15,9 @@ impl EchidnaSidebar {
glib::Object::new(&[]).expect("Failed to create 'EchidnaSidebar' component.")
}
}
impl Default for EchidnaSidebar {
fn default() -> Self {
Self::new()
}
}

View File

@ -36,9 +36,9 @@ impl BuildableImpl for TabLabel {
fn add_child(
&self,
buildable: &Self::Type,
builder: &gtk::Builder,
_builder: &gtk::Builder,
child: &glib::Object,
type_: Option<&str>,
_type_: Option<&str>,
) {
buildable.prepend(child.downcast_ref::<gtk::Widget>().unwrap());
}

View File

@ -17,8 +17,9 @@ impl TabLabel {
pub fn new<U: IsA<gtk::Widget>>(tab_label: Option<&U>) -> Self {
let this: Self = glib::Object::new(&[]).expect("Failed to create 'TabLabel' component.");
if tab_label.is_some() {
this.prepend(tab_label.unwrap());
match tab_label {
Some(tab_label) => this.prepend(tab_label),
None => {}
}
this
}

View File

@ -67,7 +67,7 @@ impl FileImplementedEditor for super::EchidnaWindow {
notebook.prepend_closable_page(
&editor_page,
Some(&Label::new(Some(
&file_location
file_location
.path()
.expect("The file's path is missing")
.file_name()

View File

@ -4,7 +4,7 @@
use crate::components::tab_label::TabLabel;
use glib::IsA;
use gtk::{prelude::*, Box, Button, Widget};
use gtk::{prelude::*, Widget};
pub trait ClosableTabImplementedNotebook {
fn prepend_closable_page<T: IsA<Widget>, U: IsA<Widget>>(