niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: from string impl

Browse Source 
Remove redudant impl's, use `.as_str()`
This commit is contained in:
Jack Wills
2023-09-17 18:41:10 +00:00
parent 18c3ed4337
commit ca79893df5
3 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app_data/mod.rs
+4 -7
View File
@@ -426,7 +426,7 @@ impl AppData {
/// So can display nicely and evenly
pub fn get_width(&self) -> Columns {
let mut columns = Columns::new();
let count = |x: &String| u8::try_from(x.chars().count()).unwrap_or(12);
let count = |x: &str| u8::try_from(x.chars().count()).unwrap_or(12);
// Should probably find a refactor here somewhere
for container in &self.containers.items {
@@ -552,9 +552,6 @@ impl AppData {
}
}
// Trim a &String and return String
let trim_owned = |x: &String| x.trim().to_owned();
for i in all_containers {
if let Some(id) = i.id.as_ref() {
let name = i.names.as_mut().map_or(String::new(), |names| {
@@ -571,15 +568,15 @@ impl AppData {
.as_ref()
.map_or(false, |i| i.starts_with(ENTRY_POINT));
let state = State::from(i.state.as_ref().map_or("dead".to_owned(), trim_owned));
let status = i.status.as_ref().map_or(String::new(), trim_owned);
let state = State::from(i.state.as_ref().map_or("dead", |z| z));
let status = i.status.as_ref().map_or(String::new(), std::clone::Clone::clone);
let image = i
.image
.as_ref()
.map_or(String::new(), std::clone::Clone::clone);
let id = ContainerId::from(id);
let id = ContainerId::from(id.as_str());
let created = i
.created