Skip to content

Commit

Permalink
Linting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
joepio committed Jan 23, 2023
1 parent 39f0050 commit 2087d64
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 26 deletions.
10 changes: 5 additions & 5 deletions cli/src/new.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ fn prompt_field(
match &property.data_type {
DataType::String | DataType::Markdown => {
let msg = format!("string{}", msg_appendix);
input = prompt_opt(&msg)?;
input = prompt_opt(msg)?;
return Ok(input);
}
DataType::Slug => {
let msg = format!("slug{}", msg_appendix);
input = prompt_opt(&msg)?;
input = prompt_opt(msg)?;
let re = Regex::new(atomic_lib::values::SLUG_REGEX)?;
match input {
Some(slug) => {
Expand All @@ -153,7 +153,7 @@ fn prompt_field(
}
DataType::Integer => {
let msg = format!("integer{}", msg_appendix);
let number: Option<u32> = prompt_opt(&msg)?;
let number: Option<u32> = prompt_opt(msg)?;
match number {
Some(nr) => {
input = Some(nr.to_string());
Expand All @@ -163,7 +163,7 @@ fn prompt_field(
}
DataType::Float => {
let msg = format!("float{}", msg_appendix);
let number: Option<f64> = prompt_opt(&msg)?;
let number: Option<f64> = prompt_opt(msg)?;
match number {
Some(nr) => {
input = Some(nr.to_string());
Expand Down Expand Up @@ -282,7 +282,7 @@ fn prompt_field(
}
DataType::Boolean => {
let msg = format!("boolean{}", msg_appendix);
let number: Option<bool> = prompt_opt(&msg)?;
let number: Option<bool> = prompt_opt(msg)?;
match number {
Some(nr) => {
if nr {
Expand Down
16 changes: 8 additions & 8 deletions cli/tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,45 @@ mod test {
#[test]
fn get_fail() {
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
cmd.args(&["get", "random-non-existent-shortname"])
cmd.args(["get", "random-non-existent-shortname"])
.assert()
.failure();
}

#[test]
fn get_shortname() {
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
cmd.args(&["get", "shortname"]).assert().success();
cmd.args(["get", "shortname"]).assert().success();
}

#[test]
fn get_url() {
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
cmd.args(&["get", "https://atomicdata.dev/classes"])
cmd.args(["get", "https://atomicdata.dev/classes"])
.assert()
.success();
}

#[test]
fn get_path() {
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
cmd.args(&["get", "https://atomicdata.dev/classes members"])
cmd.args(["get", "https://atomicdata.dev/classes members"])
.assert()
.success();
}

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

#[test]
fn get_path_array_non_existent() {
let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
cmd.args(&["get", "https://atomicdata.dev/classes is-a 1"])
cmd.args(["get", "https://atomicdata.dev/classes is-a 1"])
.assert()
.failure();
}
Expand All @@ -59,7 +59,7 @@ mod test {
.to_string();
let mut cmd_set = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
cmd_set
.args(&[
.args([
"set",
"https://atomicdata.dev/test",
atomic_lib::urls::SHORTNAME,
Expand All @@ -70,7 +70,7 @@ mod test {

let mut cmd_get = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
let result = cmd_get
.args(&["get", "https://atomicdata.dev/test shortname"])
.args(["get", "https://atomicdata.dev/test shortname"])
.assert()
.success()
.to_string();
Expand Down
6 changes: 2 additions & 4 deletions desktop/src/system_tray.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use tauri::api::shell;
use tauri::window::WindowBuilder;
use tauri::{
AppHandle, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu,
SystemTrayMenuItem, WindowUrl,
api::shell, window::WindowBuilder, AppHandle, CustomMenuItem, Manager, SystemTray,
SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem, WindowUrl,
};

pub fn build() -> SystemTray {
Expand Down
2 changes: 1 addition & 1 deletion lib/benches/benchmarks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ fn criterion_benchmark(c: &mut Criterion) {

c.bench_function("all_resources()", |b| {
b.iter(|| {
store.all_resources(false);
store.all_resources(false).count();
})
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/db/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ fn destroy_resource_and_check_collection_and_commits() {

_res.resource_new.unwrap().destroy(&store).unwrap();
let agents_collection_3 = store
.get_resource_extended(&agents_url.to_string(), false, None)
.get_resource_extended(&agents_url, false, None)
.unwrap();
let agents_collection_count_3 = agents_collection_3
.get(crate::urls::COLLECTION_MEMBER_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion lib/src/db/val_prop_sub_index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub fn find_in_val_prop_sub_index(store: &Db, val: &Value, prop: Option<&str>) -
let mut prefix: Vec<u8> = [value_key.as_bytes(), &[SEPARATION_BIT]].concat();
if let Some(prop) = prop {
prefix.extend(prop.as_bytes());
prefix.extend(&[SEPARATION_BIT]);
prefix.extend([SEPARATION_BIT]);
}
Box::new(
store
Expand Down
4 changes: 1 addition & 3 deletions lib/src/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ impl Storelike for Store {
self.hashmap
.lock()
.unwrap()
.clone()
.into_iter()
.map(|(_subject, resource)| resource),
.clone().into_values(),
)
}

Expand Down
6 changes: 3 additions & 3 deletions server/tests/server-cli.rs
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
#[test]
fn wrong_command() {
let mut cmd = assert_cmd::Command::cargo_bin("atomic-server").unwrap();
cmd.args(&["non-existent-command"]).assert().failure();
cmd.args(["non-existent-command"]).assert().failure();
}

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

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

0 comments on commit 2087d64

Please sign in to comment.