Skip to content

Commit

Permalink
cargo clippy with rust 1.67
Browse files Browse the repository at this point in the history
  • Loading branch information
@mothsART
mothsART committed Jan 28, 2023
1 parent 4e3bc40 commit d839f24
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/collect.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub fn get_dirs(xdg_data_dirs: &str) -> Vec<String> {
pub fn collect_desktops_path(dirs: Vec<String>) -> Vec<String> {
let mut result = vec![];
for d in dirs {
for desktop_file in glob(&format!("{}/*.desktop", d)).unwrap() {
for desktop_file in glob(&format!("{d}/*.desktop")).unwrap() {
match desktop_file {
Ok(path) => result.push(path.display().to_string()),
Err(_e) => continue,
Expand Down
70 changes: 35 additions & 35 deletions src/db/populate.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,20 @@ impl PopulateDb for DesktopDDb {
app_id += 1;

if let Some(_locale_id) = locales.get(no_locale) {
let app_hash = format!("{}_{}", app_id, d.default_name);
let locale_hash = format!("{}_{}", _locale_id, d.default_name);
let app_hash = format!("{app_id}_{}", d.default_name);
let locale_hash = format!("{_locale_id}_{}", d.default_name);
if !constrain_app_keywords.contains(&app_hash)
&& !constrain_locale_keywords.contains(&locale_hash)
{
constrain_app_keywords.insert(app_hash);
constrain_locale_keywords.insert(locale_hash);

let a_l_hash = format!("{}_{}", app_id, _locale_id);
let a_l_hash = format!("{app_id}_{_locale_id}");
if !constrain_app_locale.contains(&a_l_hash) {
constrain_app_locale.insert(a_l_hash);

let a_l = NewAppLocale {
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(app_locale::table)
Expand All @@ -110,7 +110,7 @@ impl PopulateDb for DesktopDDb {

let default_comment = NewKeywords {
key: &d.default_name,
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(keywords::table)
Expand All @@ -121,8 +121,8 @@ impl PopulateDb for DesktopDDb {

for n in &d.i18n_names {
if let Some(_locale_id) = locales.get(n.0) {
let app_hash = format!("{}_{}", app_id, n.1);
let locale_hash = format!("{}_{}", _locale_id, n.1);
let app_hash = format!("{app_id}_{}", n.1);
let locale_hash = format!("{_locale_id}_{}", n.1);
if constrain_app_keywords.contains(&app_hash)
|| constrain_locale_keywords.contains(&locale_hash)
{
Expand All @@ -131,12 +131,12 @@ impl PopulateDb for DesktopDDb {
constrain_app_keywords.insert(app_hash);
constrain_locale_keywords.insert(locale_hash);

let a_l_hash = format!("{}_{}", app_id, _locale_id);
let a_l_hash = format!("{app_id}_{_locale_id}");
if !constrain_app_locale.contains(&a_l_hash) {
constrain_app_locale.insert(a_l_hash);

let a_l = NewAppLocale {
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(app_locale::table)
Expand All @@ -146,7 +146,7 @@ impl PopulateDb for DesktopDDb {

let keyword = NewKeywords {
key: n.1,
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(keywords::table)
Expand All @@ -157,8 +157,8 @@ impl PopulateDb for DesktopDDb {

for g in &d.i18n_generic_names {
if let Some(_locale_id) = locales.get(g.0) {
let app_hash = format!("{}_{}", app_id, g.1);
let locale_hash = format!("{}_{}", _locale_id, g.1);
let app_hash = format!("{app_id}_{}", g.1);
let locale_hash = format!("{_locale_id}_{}", g.1);
if constrain_app_keywords.contains(&app_hash)
|| constrain_locale_keywords.contains(&locale_hash)
{
Expand All @@ -167,12 +167,12 @@ impl PopulateDb for DesktopDDb {
constrain_app_keywords.insert(app_hash);
constrain_locale_keywords.insert(locale_hash);

let a_l_hash = format!("{}_{}", app_id, _locale_id);
let a_l_hash = format!("{app_id}_{_locale_id}");
if !constrain_app_locale.contains(&a_l_hash) {
constrain_app_locale.insert(a_l_hash);

let a_l = NewAppLocale {
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(app_locale::table)
Expand All @@ -182,7 +182,7 @@ impl PopulateDb for DesktopDDb {

let keyword = NewKeywords {
key: g.1,
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(keywords::table)
Expand All @@ -194,20 +194,20 @@ impl PopulateDb for DesktopDDb {
if let (Some(d_comment), Some(_locale_id)) =
(d.default_comment.as_deref(), locales.get(no_locale))
{
let app_hash = format!("{}_{}", app_id, d_comment);
let locale_hash = format!("{}_{}", _locale_id, d_comment);
let app_hash = format!("{app_id}_{d_comment}");
let locale_hash = format!("{_locale_id}_{d_comment}");
if !constrain_app_comments.contains(&app_hash)
&& !constrain_locale_comments.contains(&locale_hash)
{
constrain_app_comments.insert(app_hash);
constrain_locale_comments.insert(locale_hash);

let a_l_hash = format!("{}_{}", app_id, _locale_id);
let a_l_hash = format!("{app_id}_{_locale_id}");
if !constrain_app_locale.contains(&a_l_hash) {
constrain_app_locale.insert(a_l_hash);

let a_l = NewAppLocale {
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(app_locale::table)
Expand All @@ -217,7 +217,7 @@ impl PopulateDb for DesktopDDb {

let default_comment = NewComments {
title: d_comment,
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(comments::table)
Expand All @@ -228,8 +228,8 @@ impl PopulateDb for DesktopDDb {

for c in &d.i18n_comments {
if let Some(_locale_id) = locales.get(c.0) {
let app_hash = format!("{}_{}", app_id, c.1);
let locale_hash = format!("{}_{}", _locale_id, c.1);
let app_hash = format!("{app_id}_{}", c.1);
let locale_hash = format!("{_locale_id}_{}", c.1);
if constrain_app_comments.contains(&app_hash)
|| constrain_locale_comments.contains(&locale_hash)
{
Expand All @@ -238,12 +238,12 @@ impl PopulateDb for DesktopDDb {
constrain_app_comments.insert(app_hash);
constrain_locale_comments.insert(locale_hash);

let a_l_hash = format!("{}_{}", app_id, _locale_id);
let a_l_hash = format!("{app_id}_{_locale_id}");
if !constrain_app_locale.contains(&a_l_hash) {
constrain_app_locale.insert(a_l_hash);

let a_l = NewAppLocale {
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(app_locale::table)
Expand All @@ -253,7 +253,7 @@ impl PopulateDb for DesktopDDb {

let comment = NewComments {
title: c.1,
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(comments::table)
Expand All @@ -264,8 +264,8 @@ impl PopulateDb for DesktopDDb {

for k in &d.default_keywords {
if let Some(_locale_id) = locales.get(no_locale) {
let app_hash = format!("{}_{}", app_id, k);
let locale_hash = format!("{}_{}", _locale_id, k);
let app_hash = format!("{app_id}_{k}");
let locale_hash = format!("{_locale_id}_{k}");
if constrain_app_keywords.contains(&app_hash)
|| constrain_locale_keywords.contains(&locale_hash)
{
Expand All @@ -274,12 +274,12 @@ impl PopulateDb for DesktopDDb {
constrain_app_keywords.insert(app_hash);
constrain_locale_keywords.insert(locale_hash);

let a_l_hash = format!("{}_{}", app_id, _locale_id);
let a_l_hash = format!("{app_id}_{_locale_id}");
if !constrain_app_locale.contains(&a_l_hash) {
constrain_app_locale.insert(a_l_hash);

let a_l = NewAppLocale {
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(app_locale::table)
Expand All @@ -289,7 +289,7 @@ impl PopulateDb for DesktopDDb {

let keyword = NewKeywords {
key: k,
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(keywords::table)
Expand All @@ -301,8 +301,8 @@ impl PopulateDb for DesktopDDb {
for k_lang in &d.i18n_keywords {
if let Some(_locale_id) = locales.get(k_lang.0) {
for k in k_lang.1 {
let app_hash = format!("{}_{}", app_id, k);
let locale_hash = format!("{}_{}", _locale_id, k);
let app_hash = format!("{app_id}_{k}");
let locale_hash = format!("{_locale_id}_{k}");
if constrain_app_keywords.contains(&app_hash)
|| constrain_locale_keywords.contains(&locale_hash)
{
Expand All @@ -311,12 +311,12 @@ impl PopulateDb for DesktopDDb {
constrain_app_keywords.insert(app_hash);
constrain_locale_keywords.insert(locale_hash);

let a_l_hash = format!("{}_{}", app_id, _locale_id);
let a_l_hash = format!("{app_id}_{_locale_id}");
if !constrain_app_locale.contains(&a_l_hash) {
constrain_app_locale.insert(a_l_hash);

let a_l = NewAppLocale {
app_id: app_id as i32,
app_id,
locale_id: *_locale_id,
};
diesel::insert_into(app_locale::table)
Expand All @@ -326,7 +326,7 @@ impl PopulateDb for DesktopDDb {

let keyword = NewKeywords {
key: k,
app_id: app_id as i32,
app_id,
locale_id: 0,
};
diesel::insert_into(keywords::table)
Expand Down
4 changes: 2 additions & 2 deletions src/db/search.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ impl SearchDb for DesktopDDb {
.and(comments::locale_id.eq(locale::id))),
)
.filter(
keywords::key.like(format!("%{}%", text)).and(
keywords::key.like(format!("%{text}%")).and(
locale::key
.eq(lang)
.or(locale::key.eq(location))
Expand All @@ -81,7 +81,7 @@ impl SearchDb for DesktopDDb {

if self.debug {
let sql_debug = debug_query::<Sqlite, _>(&query);
println!("{}", sql_debug);
println!("{sql_debug}");
}

query.load::<SearchResult>(&mut self.connection)
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fn main() {
}
db.insertion(desktop_files);
}
Err(e) => eprintln!("Error: {}", e),
Err(e) => eprintln!("Error: {e}"),
}
watch();
}

0 comments on commit d839f24

Please sign in to comment.