Skip to content

clear verify clippy warnings #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xZaddyy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

clear verify clippy warnings #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions verify/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,11 @@ fn verify_status(version: Version, test_output: Option<&String>) -> Result<()> {
let out =
Method::from_name(version, &method.name).expect("guaranteed by methods_and_status()");

if !versioned::requires_type(version, &method.name)? {
if versioned::type_exists(version, &method.name)? {
if !versioned::requires_type(version, &method.name)? && versioned::type_exists(version, &method.name)? {
eprintln!("return type found but method is omitted or TODO: {}", output_method(out));
}
}
if !model::requires_type(version, &method.name)? {
if model::type_exists(version, &method.name)? {
if !model::requires_type(version, &method.name)? && model::type_exists(version, &method.name)? {
eprintln!("model type found but method is omitted or TODO: {}", output_method(out));
}
}

}
Expand All @@ -156,19 +152,15 @@ fn verify_status(version: Version, test_output: Option<&String>) -> Result<()> {
fn check_types_exist_if_required(version: Version, method_name: &str) -> Result<()> {
let out = Method::from_name(version, method_name).expect("guaranteed by methods_and_status()");

if versioned::requires_type(version, method_name)? {
if !versioned::type_exists(version, method_name)? {
if versioned::requires_type(version, method_name)? && !versioned::type_exists(version, method_name)? {
eprintln!("missing return type: {}", output_method(out));
}
}
if model::requires_type(version, method_name)? {
if !model::type_exists(version, method_name)? {
if model::requires_type(version, method_name)? && !model::type_exists(version, method_name)? {
eprintln!("missing model type: {}", output_method(out));
}
} else {
if model::type_exists(version, method_name)? {
else if model::type_exists(version, method_name)? {
eprintln!("found model type when none expected: {}", output_method(out));
}

}
Ok(())
}
Expand Down
5 changes: 1 addition & 4 deletions verify/src/versioned.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ pub fn requires_type(version: Version, method_name: &str) -> Result<bool> {
))),
};

let requires = match method.ret {
Some(Return::Type(_)) => true,
_ => false,
};
let requires = matches!(method.ret, Some(Return::Type(_)));
Ok(requires)
}

Expand Down