Skip to content

Commit

Permalink
Implement two missing commands
Browse files Browse the repository at this point in the history
  • Loading branch information
dpc committed Jul 7, 2019
1 parent c7b6b08 commit 7c7b6b8
Show file tree
Hide file tree
Showing 4 changed files with 310 additions and 133 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/target
target/
target
**/*.rs.bk

# Intellij project files
Expand Down
41 changes: 19 additions & 22 deletions cargo-crev/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl Repo {
let (package_set, _resolve) = cargo::ops::resolve_ws_precisely(
&workspace,
&[],
true, // all_features
true, // all_features
false, // no_default_features
&specs,
)?;
Expand Down Expand Up @@ -646,12 +646,9 @@ fn find_previous_review_data(
previous_review.comment.to_owned(),
));
} else if let Some(diff_base_version) = diff_base_version {
if let Some(base_review) = db.get_pkg_review(
PROJECT_SOURCE_CRATES_IO,
name,
&diff_base_version,
&id.id,
) {
if let Some(base_review) =
db.get_pkg_review(PROJECT_SOURCE_CRATES_IO, name, &diff_base_version, &id.id)
{
return Some((
None,
base_review.review.to_owned(),
Expand Down Expand Up @@ -821,16 +818,17 @@ fn maybe_store(
Ok(())
}

fn find_reviews(
crate_: &opts::CrateSelector,
) -> Result<Vec<proof::review::Package>> {
fn find_reviews(crate_: &opts::CrateSelector) -> Result<Vec<proof::review::Package>> {
let local = crev_lib::Local::auto_open()?;
let db = local.load_db()?;
Ok(db.get_package_reviews_for_package(
PROJECT_SOURCE_CRATES_IO,
crate_.name.as_ref().map(String::as_str),
crate_.version.as_ref(),
).cloned().collect())
Ok(db
.get_package_reviews_for_package(
PROJECT_SOURCE_CRATES_IO,
crate_.name.as_ref().map(String::as_str),
crate_.version.as_ref(),
)
.cloned()
.collect())
}

fn list_reviews(crate_: &opts::CrateSelector) -> Result<()> {
Expand All @@ -841,9 +839,7 @@ fn list_reviews(crate_: &opts::CrateSelector) -> Result<()> {
Ok(())
}

fn find_advisories(
crate_: &opts::CrateSelector,
) -> Result<Vec<proof::review::Package>> {
fn find_advisories(crate_: &opts::CrateSelector) -> Result<Vec<proof::review::Package>> {
let local = crev_lib::Local::auto_open()?;
let db = local.load_db()?;

Expand All @@ -853,7 +849,8 @@ fn find_advisories(
crate_.name.as_ref().map(String::as_str),
crate_.version.as_ref(),
)
.cloned().collect())
.cloned()
.collect())
}

fn find_issues(
Expand All @@ -868,7 +865,7 @@ fn find_issues(

let mut reviews: BTreeMap<Version, proof::review::Package> = BTreeMap::new();

for (_id, reports) in db.get_issues(
for (_id, reports) in db.get_open_issues(
PROJECT_SOURCE_CRATES_IO,
crate_.name.as_ref().map(String::as_str),
crate_.version.as_ref(),
Expand Down Expand Up @@ -1286,15 +1283,15 @@ fn run_command(command: opts::Command) -> Result<CommandExitStatus> {
.unwrap_or_else(|| "?".into())
);

let issues_from_trusted = db.get_issues_for_version(
let issues_from_trusted = db.get_open_issues_for_version(
PROJECT_SOURCE_CRATES_IO,
crate_name,
crate_version,
&trust_set,
args.requirements.trust_level.into(),
);

let issues_from_all = db.get_issues_for_version(
let issues_from_all = db.get_open_issues_for_version(
PROJECT_SOURCE_CRATES_IO,
crate_name,
crate_version,
Expand Down
Loading

0 comments on commit 7c7b6b8

Please sign in to comment.