Skip to content

Removed duplicate ok check #2044

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

Merged
eeeebbbbrrrr merged 1 commit into from
May 6, 2025
Merged

Removed duplicate ok check #2044

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
28 changes: 13 additions & 15 deletions cargo-pgrx/src/command/get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,19 @@ pub(crate) fn find_control_file(
for f in std::fs::read_dir(parent).wrap_err_with(|| {
eyre!("cannot open current directory `{}` for reading", parent.display())
})? {
if f.is_ok() {
if let Ok(f) = f {
let f_path = f.path();
if f_path.extension() == Some("control".as_ref()) {
let file_stem = f_path.file_stem().ok_or_else(|| {
eyre!("could not get file stem of `{}`", f_path.display())
})?;
let file_stem = file_stem
.to_str()
.ok_or_else(|| {
eyre!("could not get file stem as String from `{}`", f_path.display())
})?
.to_string();
return Ok((f_path, file_stem));
}
if let Ok(f) = f {
let f_path = f.path();
if f_path.extension() == Some("control".as_ref()) {
let file_stem = f_path
.file_stem()
.ok_or_else(|| eyre!("could not get file stem of `{}`", f_path.display()))?;
let file_stem = file_stem
.to_str()
.ok_or_else(|| {
eyre!("could not get file stem as String from `{}`", f_path.display())
})?
.to_string();
return Ok((f_path, file_stem));
}
}
}
Expand Down
Loading