Skip to content

Commit 2087d64

Browse files
joepiojoepio
committed
Linting fixes
1 parent 39f0050 commit 2087d64

File tree

8 files changed

+22
-26
lines changed

8 files changed

+22
-26
lines changed

‎cli/src/new.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@ fn prompt_field(
133133
match &property.data_type {
134134
DataType::String | DataType::Markdown => {
135135
let msg = format!("string{}", msg_appendix);
136-
input = prompt_opt(&msg)?;
136+
input = prompt_opt(msg)?;
137137
return Ok(input);
138138
}
139139
DataType::Slug => {
140140
let msg = format!("slug{}", msg_appendix);
141-
input = prompt_opt(&msg)?;
141+
input = prompt_opt(msg)?;
142142
let re = Regex::new(atomic_lib::values::SLUG_REGEX)?;
143143
match input {
144144
Some(slug) => {
@@ -153,7 +153,7 @@ fn prompt_field(
153153
}
154154
DataType::Integer => {
155155
let msg = format!("integer{}", msg_appendix);
156-
let number: Option<u32> = prompt_opt(&msg)?;
156+
let number: Option<u32> = prompt_opt(msg)?;
157157
match number {
158158
Some(nr) => {
159159
input = Some(nr.to_string());
@@ -163,7 +163,7 @@ fn prompt_field(
163163
}
164164
DataType::Float => {
165165
let msg = format!("float{}", msg_appendix);
166-
let number: Option<f64> = prompt_opt(&msg)?;
166+
let number: Option<f64> = prompt_opt(msg)?;
167167
match number {
168168
Some(nr) => {
169169
input = Some(nr.to_string());
@@ -282,7 +282,7 @@ fn prompt_field(
282282
}
283283
DataType::Boolean => {
284284
let msg = format!("boolean{}", msg_appendix);
285-
let number: Option<bool> = prompt_opt(&msg)?;
285+
let number: Option<bool> = prompt_opt(msg)?;
286286
match number {
287287
Some(nr) => {
288288
if nr {

‎cli/tests/tests.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,45 @@ mod test {
55
#[test]
66
fn get_fail() {
77
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
8-
cmd.args(&["get", "random-non-existent-shortname"])
8+
cmd.args(["get", "random-non-existent-shortname"])
99
.assert()
1010
.failure();
1111
}
1212

1313
#[test]
1414
fn get_shortname() {
1515
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
16-
cmd.args(&["get", "shortname"]).assert().success();
16+
cmd.args(["get", "shortname"]).assert().success();
1717
}
1818

1919
#[test]
2020
fn get_url() {
2121
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
22-
cmd.args(&["get", "https://atomicdata.dev/classes"])
22+
cmd.args(["get", "https://atomicdata.dev/classes"])
2323
.assert()
2424
.success();
2525
}
2626

2727
#[test]
2828
fn get_path() {
2929
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
30-
cmd.args(&["get", "https://atomicdata.dev/classes members"])
30+
cmd.args(["get", "https://atomicdata.dev/classes members"])
3131
.assert()
3232
.success();
3333
}
3434

3535
#[test]
3636
fn get_path_array() {
3737
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
38-
cmd.args(&["get", "https://atomicdata.dev/classes is-a 0"])
38+
cmd.args(["get", "https://atomicdata.dev/classes is-a 0"])
3939
.assert()
4040
.success();
4141
}
4242

4343
#[test]
4444
fn get_path_array_non_existent() {
4545
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
46-
cmd.args(&["get", "https://atomicdata.dev/classes is-a 1"])
46+
cmd.args(["get", "https://atomicdata.dev/classes is-a 1"])
4747
.assert()
4848
.failure();
4949
}
@@ -59,7 +59,7 @@ mod test {
5959
.to_string();
6060
let mut cmd_set = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
6161
cmd_set
62-
.args(&[
62+
.args([
6363
"set",
6464
"https://atomicdata.dev/test",
6565
atomic_lib::urls::SHORTNAME,
@@ -70,7 +70,7 @@ mod test {
7070

7171
let mut cmd_get = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
7272
let result = cmd_get
73-
.args(&["get", "https://atomicdata.dev/test shortname"])
73+
.args(["get", "https://atomicdata.dev/test shortname"])
7474
.assert()
7575
.success()
7676
.to_string();

‎desktop/src/system_tray.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
use tauri::api::shell;
2-
use tauri::window::WindowBuilder;
31
use tauri::{
4-
AppHandle, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu,
5-
SystemTrayMenuItem, WindowUrl,
2+
api::shell, window::WindowBuilder, AppHandle, CustomMenuItem, Manager, SystemTray,
3+
SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem, WindowUrl,
64
};
75

86
pub fn build() -> SystemTray {

‎lib/benches/benchmarks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn criterion_benchmark(c: &mut Criterion) {
7777

7878
c.bench_function("all_resources()", |b| {
7979
b.iter(|| {
80-
store.all_resources(false);
80+
store.all_resources(false).count();
8181
})
8282
});
8383
}

‎lib/src/db/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fn destroy_resource_and_check_collection_and_commits() {
156156

157157
_res.resource_new.unwrap().destroy(&store).unwrap();
158158
let agents_collection_3 = store
159-
.get_resource_extended(&agents_url.to_string(), false, None)
159+
.get_resource_extended(&agents_url, false, None)
160160
.unwrap();
161161
let agents_collection_count_3 = agents_collection_3
162162
.get(crate::urls::COLLECTION_MEMBER_COUNT)

‎lib/src/db/val_prop_sub_index.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub fn find_in_val_prop_sub_index(store: &Db, val: &Value, prop: Option<&str>) -
4747
let mut prefix: Vec<u8> = [value_key.as_bytes(), &[SEPARATION_BIT]].concat();
4848
if let Some(prop) = prop {
4949
prefix.extend(prop.as_bytes());
50-
prefix.extend(&[SEPARATION_BIT]);
50+
prefix.extend([SEPARATION_BIT]);
5151
}
5252
Box::new(
5353
store

‎lib/src/store.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,7 @@ impl Storelike for Store {
182182
self.hashmap
183183
.lock()
184184
.unwrap()
185-
.clone()
186-
.into_iter()
187-
.map(|(_subject, resource)| resource),
185+
.clone().into_values(),
188186
)
189187
}
190188

‎server/tests/server-cli.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
#[test]
22
fn wrong_command() {
33
let mut cmd = assert_cmd::Command::cargo_bin("atomic-server").unwrap();
4-
cmd.args(&["non-existent-command"]).assert().failure();
4+
cmd.args(["non-existent-command"]).assert().failure();
55
}
66

77
#[test]
88
fn help() {
99
let mut cmd = assert_cmd::Command::cargo_bin("atomic-server").unwrap();
10-
cmd.args(&["help"]).assert().success();
10+
cmd.args(["help"]).assert().success();
1111
}
1212

1313
#[test]
1414
fn import_file() {
1515
let mut cmd = assert_cmd::Command::cargo_bin("atomic-server").unwrap();
1616
let mut d = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
1717
d.push("../lib/test_files/local_id.json");
18-
cmd.args(&["import", "--file", d.to_str().unwrap()])
18+
cmd.args(["import", "--file", d.to_str().unwrap()])
1919
.assert()
2020
.success();
2121
}

0 commit comments

Comments
 (0)