diff options
Diffstat (limited to 'crates')
8 files changed, 90 insertions, 75 deletions
diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs index ff93268a..41cef838 100644 --- a/crates/shirabe/src/advisory/auditor.rs +++ b/crates/shirabe/src/advisory/auditor.rs @@ -23,9 +23,9 @@ use shirabe_php_shim::{ #[derive(serde::Serialize)] struct AuditJsonReport<'a> { #[serde(serialize_with = "serialize_advisories_field")] - advisories: &'a IndexMap<String, Vec<AnySecurityAdvisory>>, + advisories: &'a IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, #[serde(rename = "ignored-advisories", skip_serializing_if = "Option::is_none")] - ignored_advisories: Option<&'a IndexMap<String, Vec<AnySecurityAdvisory>>>, + ignored_advisories: Option<&'a IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>>, #[serde( rename = "unreachable-repositories", skip_serializing_if = "Option::is_none" @@ -55,7 +55,7 @@ where } fn serialize_advisories_field<S>( - map: &&IndexMap<String, Vec<AnySecurityAdvisory>>, + map: &&IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, serializer: S, ) -> anyhow::Result<S::Ok, S::Error> where @@ -197,7 +197,7 @@ impl Auditor { let error_or_warn = if warning_only { "warning" } else { "error" }; if affected_packages_count > 0 || !ignored_advisories.is_empty() { let passes: Vec<( - &IndexMap<String, Vec<AnySecurityAdvisory>>, + &IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, String, )> = vec![ ( @@ -263,7 +263,7 @@ impl Auditor { /// @return bool pub fn needs_complete_advisory_load( &self, - advisories: &IndexMap<String, Vec<AnySecurityAdvisory>>, + advisories: &IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, ignore_list: &IndexMap<String, Option<String>>, ) -> bool { if advisories.is_empty() { @@ -271,15 +271,15 @@ impl Auditor { } // no partial advisories present - let advisories_values: Vec<&Vec<AnySecurityAdvisory>> = advisories.values().collect(); - if array_all( - &advisories_values, - |pkg_advisories: &&Vec<AnySecurityAdvisory>| { - array_all(pkg_advisories, |advisory: &AnySecurityAdvisory| { + let advisories_values: Vec<_> = advisories.values().collect(); + if array_all(&advisories_values, |pkg_advisories| { + array_all( + pkg_advisories, + |advisory: &std::rc::Rc<AnySecurityAdvisory>| { advisory.as_security_advisory().is_some() - }) - }, - ) { + }, + ) + }) { return false; } @@ -321,7 +321,7 @@ impl Auditor { pub fn process_advisories( &self, - all_advisories: IndexMap<String, Vec<AnySecurityAdvisory>>, + all_advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, ignore_list: &IndexMap<String, Option<String>>, ignored_severities: &IndexMap<String, Option<String>>, ) -> ProcessAdvisoriesResult { @@ -332,8 +332,9 @@ impl Auditor { }; } - let mut advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); - let mut ignored: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = + IndexMap::new(); + let mut ignored: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = IndexMap::new(); let mut ignore_reason: Option<String> = None; for (package, pkg_advisories) in all_advisories { @@ -394,7 +395,9 @@ impl Auditor { // and in that case we do not need to cast the object. let advisory = if advisory.as_security_advisory().is_some() { let full = advisory.as_security_advisory().unwrap(); - AnySecurityAdvisory::Ignored(full.to_ignored_advisory(ignore_reason.clone())) + std::rc::Rc::new(AnySecurityAdvisory::Ignored( + full.to_ignored_advisory(ignore_reason.clone()), + )) } else { advisory }; @@ -412,7 +415,7 @@ impl Auditor { /// @return array{int, int} Count of affected packages and total count of advisories fn count_advisories( &self, - advisories: &IndexMap<String, Vec<AnySecurityAdvisory>>, + advisories: &IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, ) -> (i64, i64) { let mut count: i64 = 0; for package_advisories in advisories.values() { @@ -427,7 +430,7 @@ impl Auditor { fn output_advisories( &self, io: &std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, - advisories: &IndexMap<String, Vec<AnySecurityAdvisory>>, + advisories: &IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, format: &str, ) -> anyhow::Result<()> { match format { @@ -473,7 +476,7 @@ impl Auditor { fn output_advisories_table( &self, io: &ConsoleIO, - advisories: &IndexMap<String, Vec<AnySecurityAdvisory>>, + advisories: &IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, ) -> anyhow::Result<()> { for package_advisories in advisories.values() { for advisory in package_advisories { @@ -534,7 +537,7 @@ impl Auditor { fn output_advisories_plain( &self, io: &std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, - advisories: &IndexMap<String, Vec<AnySecurityAdvisory>>, + advisories: &IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, ) -> anyhow::Result<()> { let mut error: Vec<String> = vec![]; let mut first_advisory = true; @@ -745,6 +748,6 @@ impl Auditor { #[derive(Debug)] pub struct ProcessAdvisoriesResult { - pub advisories: IndexMap<String, Vec<AnySecurityAdvisory>>, - pub ignored_advisories: IndexMap<String, Vec<AnySecurityAdvisory>>, + pub advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, + pub ignored_advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, } diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs index adf42f54..a9dffe71 100644 --- a/crates/shirabe/src/dependency_resolver/pool.rs +++ b/crates/shirabe/src/dependency_resolver/pool.rs @@ -28,7 +28,8 @@ pub struct Pool { /// @var array<string, array<string, string>> Map of package object hash => removed normalized versions => removed pretty version pub(crate) removed_versions_by_package: IndexMap<String, IndexMap<String, String>>, /// @var array<string, array<string, array<SecurityAdvisory|PartialSecurityAdvisory>>> Map of package name => normalized version => security advisories - security_removed_versions: IndexMap<String, IndexMap<String, Vec<AnySecurityAdvisory>>>, + security_removed_versions: + IndexMap<String, IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>>, /// @var array<string, array<string, string>> Map of package name => normalized version => pretty version abandoned_removed_versions: IndexMap<String, IndexMap<String, String>>, } @@ -45,7 +46,10 @@ impl Pool { unacceptable_fixed_or_locked_packages: Vec<BasePackageHandle>, removed_versions: IndexMap<String, IndexMap<String, String>>, removed_versions_by_package: IndexMap<String, IndexMap<String, String>>, - security_removed_versions: IndexMap<String, IndexMap<String, Vec<AnySecurityAdvisory>>>, + security_removed_versions: IndexMap< + String, + IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, + >, abandoned_removed_versions: IndexMap<String, IndexMap<String, String>>, ) -> Self { let mut this = Self { @@ -182,7 +186,7 @@ impl Pool { /// @return array<string, array<string, array<SecurityAdvisory|PartialSecurityAdvisory>>> pub fn get_all_security_removed_package_versions( &self, - ) -> &IndexMap<String, IndexMap<String, Vec<AnySecurityAdvisory>>> { + ) -> &IndexMap<String, IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>> { &self.security_removed_versions } diff --git a/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs b/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs index 59acad89..c2b95bd7 100644 --- a/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs +++ b/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs @@ -87,7 +87,7 @@ impl SecurityAdvisoryPoolFilter { let mut packages: Vec<BasePackageHandle> = vec![]; let mut security_removed_versions: IndexMap< String, - IndexMap<String, Vec<AnySecurityAdvisory>>, + IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, > = IndexMap::new(); let mut abandoned_removed_versions: IndexMap<String, IndexMap<String, String>> = IndexMap::new(); @@ -144,13 +144,13 @@ impl SecurityAdvisoryPoolFilter { fn get_matching_advisories( &self, package: BasePackageHandle, - advisory_map: &IndexMap<String, Vec<AnySecurityAdvisory>>, - ) -> Vec<AnySecurityAdvisory> { + advisory_map: &IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, + ) -> Vec<std::rc::Rc<AnySecurityAdvisory>> { if package.is_dev() { return vec![]; } - let mut matching_advisories: Vec<AnySecurityAdvisory> = vec![]; + let mut matching_advisories = vec![]; for package_name in package.get_names(false) { if !advisory_map.contains_key(&package_name) { continue; diff --git a/crates/shirabe/src/repository/advisory_provider_interface.rs b/crates/shirabe/src/repository/advisory_provider_interface.rs index f1e639a1..466093c1 100644 --- a/crates/shirabe/src/repository/advisory_provider_interface.rs +++ b/crates/shirabe/src/repository/advisory_provider_interface.rs @@ -7,7 +7,7 @@ use shirabe_semver::constraint::AnyConstraint; #[derive(Debug)] pub struct SecurityAdvisoryResult { pub names_found: Vec<String>, - pub advisories: IndexMap<String, Vec<AnySecurityAdvisory>>, + pub advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, } pub trait AdvisoryProviderInterface { diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index 876ba3b8..558d7e00 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -920,7 +920,7 @@ impl ComposerRepository { }); } - let mut advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut advisories = IndexMap::new(); let mut names_found: IndexMap<String, bool> = IndexMap::new(); let api_url = self @@ -943,7 +943,7 @@ impl ComposerRepository { let create = |data: &IndexMap<String, PhpMixed>, name: &str, package_constraint_map: &IndexMap<String, AnyConstraint>| - -> anyhow::Result<Option<AnySecurityAdvisory>> { + -> anyhow::Result<Option<std::rc::Rc<AnySecurityAdvisory>>> { let advisory = PartialSecurityAdvisory::create(name, data, &parser)?; let is_full = matches!(advisory, AnySecurityAdvisory::Full(_)); if !allow_partial_advisories && !is_full { @@ -971,7 +971,7 @@ impl ComposerRepository { return Ok(None); } - Ok(Some(advisory)) + Ok(Some(std::rc::Rc::new(advisory))) }; if self @@ -1030,7 +1030,7 @@ impl ComposerRepository { names_found.insert(name.clone(), true); if !sec_advs_arr.is_empty() { - let mut entries: Vec<AnySecurityAdvisory> = Vec::new(); + let mut entries: Vec<std::rc::Rc<AnySecurityAdvisory>> = Vec::new(); for data_mixed in sec_advs_arr.into_iter() { if let PhpMixed::Array(data_map) = data_mixed && let Some(adv) = create(&data_map, &name, &package_constraint_map)? @@ -1112,7 +1112,7 @@ impl ComposerRepository { None => continue, }; if !list.is_empty() { - let mut entries: Vec<AnySecurityAdvisory> = Vec::new(); + let mut entries: Vec<std::rc::Rc<AnySecurityAdvisory>> = Vec::new(); for data_mixed in list.iter() { if let Some(data) = data_mixed.as_array() { let data_map: IndexMap<String, PhpMixed> = @@ -1128,10 +1128,11 @@ impl ComposerRepository { } } - let advisories_filtered: IndexMap<String, Vec<AnySecurityAdvisory>> = advisories - .into_iter() - .filter(|(_, adv)| !adv.is_empty()) - .collect(); + let advisories_filtered: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = + advisories + .into_iter() + .filter(|(_, adv)| !adv.is_empty()) + .collect(); Ok(SecurityAdvisoryResult { names_found: names_found.keys().cloned().collect(), diff --git a/crates/shirabe/src/repository/package_repository.rs b/crates/shirabe/src/repository/package_repository.rs index 7f61bc9e..3397f071 100644 --- a/crates/shirabe/src/repository/package_repository.rs +++ b/crates/shirabe/src/repository/package_repository.rs @@ -211,7 +211,7 @@ impl AdvisoryProviderInterface for PackageRepository { ) -> anyhow::Result<SecurityAdvisoryResult> { let parser = VersionParser::new(); - let mut advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut advisories = IndexMap::new(); for (package_name, package_advisories) in &self.security_advisories { let Some(package_constraint) = package_constraint_map.get(package_name) else { continue; @@ -221,7 +221,7 @@ impl AdvisoryProviderInterface for PackageRepository { PhpMixed::List(list) => list, _ => continue, }; - let mut items: Vec<AnySecurityAdvisory> = Vec::new(); + let mut items: Vec<std::rc::Rc<AnySecurityAdvisory>> = Vec::new(); for data in list { let data_map: IndexMap<String, PhpMixed> = match data { PhpMixed::Array(m) => m.clone(), @@ -249,13 +249,13 @@ impl AdvisoryProviderInterface for PackageRepository { continue; } - items.push(advisory); + items.push(std::rc::Rc::new(advisory)); } advisories.insert(package_name.clone(), items); } let names_found: Vec<String> = advisories.keys().cloned().collect(); - let advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = advisories + let advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = advisories .into_iter() .filter(|(_, adv)| !adv.is_empty()) .collect(); diff --git a/crates/shirabe/src/repository/repository_set.rs b/crates/shirabe/src/repository/repository_set.rs index c407a1ce..8443400f 100644 --- a/crates/shirabe/src/repository/repository_set.rs +++ b/crates/shirabe/src/repository/repository_set.rs @@ -363,8 +363,9 @@ impl RepositorySet { allow_partial_advisories: bool, ignore_unreachable: bool, unreachable_repos: &mut Vec<String>, - ) -> anyhow::Result<IndexMap<String, Vec<AnySecurityAdvisory>>> { - let mut repo_advisories: Vec<IndexMap<String, Vec<AnySecurityAdvisory>>> = vec![]; + ) -> anyhow::Result<IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>> { + let mut repo_advisories: Vec<IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>> = + vec![]; for repository in &self.repositories { let attempt: anyhow::Result<()> = (|| -> anyhow::Result<()> { let mut repo_ref = repository.borrow_mut(); @@ -403,7 +404,8 @@ impl RepositorySet { } } - let mut advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = + IndexMap::new(); for repo in repo_advisories { for (name, list) in repo { advisories.entry(name).or_default().extend(list); @@ -672,6 +674,6 @@ impl RepositorySetInterface for RepositorySet { #[derive(Debug)] pub struct SecurityAdvisoriesResult { - pub advisories: IndexMap<String, Vec<AnySecurityAdvisory>>, + pub advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, pub unreachable_repos: Vec<String>, } diff --git a/crates/shirabe/tests/advisory/auditor_test.rs b/crates/shirabe/tests/advisory/auditor_test.rs index 5e6a3ba8..adc90a4d 100644 --- a/crates/shirabe/tests/advisory/auditor_test.rs +++ b/crates/shirabe/tests/advisory/auditor_test.rs @@ -34,11 +34,11 @@ fn constraint(operator: &str, version: &str) -> shirabe_semver::constraint::AnyC SimpleConstraint::new(operator.to_string(), version.to_string(), None).into() } -fn full_advisory() -> AnySecurityAdvisory { +fn full_advisory() -> std::rc::Rc<AnySecurityAdvisory> { let mut source: IndexMap<String, String> = IndexMap::new(); source.insert("name".to_string(), "foo".to_string()); source.insert("remoteId".to_string(), "remoteID".to_string()); - AnySecurityAdvisory::Full(SecurityAdvisory::new( + std::rc::Rc::new(AnySecurityAdvisory::Full(SecurityAdvisory::new( "foo/bar".to_string(), "123".to_string(), constraint("=", "1.0.0.0"), @@ -48,14 +48,14 @@ fn full_advisory() -> AnySecurityAdvisory { None, None, None, - )) + ))) } -fn full_advisory_with_id(advisory_id: &str) -> AnySecurityAdvisory { +fn full_advisory_with_id(advisory_id: &str) -> std::rc::Rc<AnySecurityAdvisory> { let mut source: IndexMap<String, String> = IndexMap::new(); source.insert("name".to_string(), "foo".to_string()); source.insert("remoteId".to_string(), "remoteID".to_string()); - AnySecurityAdvisory::Full(SecurityAdvisory::new( + std::rc::Rc::new(AnySecurityAdvisory::Full(SecurityAdvisory::new( "foo/bar".to_string(), advisory_id.to_string(), constraint("=", "1.0.0.0"), @@ -65,15 +65,15 @@ fn full_advisory_with_id(advisory_id: &str) -> AnySecurityAdvisory { None, None, None, - )) + ))) } -fn partial_advisory(advisory_id: &str) -> AnySecurityAdvisory { - AnySecurityAdvisory::Partial(PartialSecurityAdvisory::new( +fn partial_advisory(advisory_id: &str) -> std::rc::Rc<AnySecurityAdvisory> { + std::rc::Rc::new(AnySecurityAdvisory::Partial(PartialSecurityAdvisory::new( "foo/bar".to_string(), advisory_id.to_string(), constraint("=", "1.0.0.0"), - )) + ))) } fn ignore_list(pairs: Vec<(&str, Option<&str>)>) -> IndexMap<String, Option<String>> { @@ -91,7 +91,7 @@ enum AdvisorySource { /// Mirrors `AuditorTest::getMockAdvisories()` filtered by the package constraint map. Table, /// Returns a fixed advisory map regardless of the request (reachable repo). - Fixed(IndexMap<String, Vec<AnySecurityAdvisory>>), + Fixed(IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>), /// Throws a `TransportException`, simulating an unreachable repository. Unreachable(String), } @@ -120,12 +120,13 @@ impl AdvisoryProviderInterface for MockAdvisoryRepository { advisories: advisories.clone(), }), AdvisorySource::Table => { - let mut advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = + IndexMap::new(); for (package, list) in mock_advisories() { let Some(constraint) = package_constraint_map.get(&package) else { continue; }; - let filtered: Vec<AnySecurityAdvisory> = list + let filtered: Vec<std::rc::Rc<AnySecurityAdvisory>> = list .into_iter() .filter(|advisory| advisory.affected_versions().matches(constraint)) .collect(); @@ -202,8 +203,8 @@ impl RepositoryInterface for MockAdvisoryRepository { /// ref: AuditorTest::getMockAdvisories. All entries carry full data so they load as /// `SecurityAdvisory` (never partial) regardless of `allowPartialAdvisories`. -fn mock_advisories() -> IndexMap<String, Vec<AnySecurityAdvisory>> { - let mut advisories: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); +fn mock_advisories() -> IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> { + let mut advisories: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = IndexMap::new(); advisories.insert( "vendor1/package1".to_string(), vec![ @@ -352,11 +353,11 @@ fn mock_advisory( remote_id: &str, reported_at: &str, severity: &str, -) -> AnySecurityAdvisory { +) -> std::rc::Rc<AnySecurityAdvisory> { let mut source: IndexMap<String, String> = IndexMap::new(); source.insert("name".to_string(), source_name.to_string()); source.insert("remoteId".to_string(), remote_id.to_string()); - AnySecurityAdvisory::Full(SecurityAdvisory::new( + std::rc::Rc::new(AnySecurityAdvisory::Full(SecurityAdvisory::new( package_name.to_string(), advisory_id.to_string(), VersionParser.parse_constraints(affected_versions).unwrap(), @@ -366,7 +367,7 @@ fn mock_advisory( Some(cve.to_string()), Some(link.to_string()), Some(severity.to_string()), - )) + ))) } /// ref: AuditorTest::getRepoSet. Real `RepositorySet` holding a single repository whose advisory @@ -854,11 +855,11 @@ fn test_audit_with_ignore_unreachable() { .to_string(); let make_repo_set = || { - let mut fixed: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut fixed: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = IndexMap::new(); fixed.insert( "vendor1/package1".to_string(), vec![ - AnySecurityAdvisory::Full(SecurityAdvisory::new( + std::rc::Rc::new(AnySecurityAdvisory::Full(SecurityAdvisory::new( "vendor1/package1".to_string(), "CVE-2023-12345".to_string(), constraint("=", "3.0.0.0"), @@ -873,8 +874,8 @@ fn test_audit_with_ignore_unreachable() { Some("CVE-2023-12345".to_string()), Some("https://example.com/advisory/1".to_string()), Some("medium".to_string()), - )), - AnySecurityAdvisory::Full(SecurityAdvisory::new( + ))), + std::rc::Rc::new(AnySecurityAdvisory::Full(SecurityAdvisory::new( "vendor1/package1".to_string(), "CVE-2023-67890".to_string(), constraint("=", "3.0.0.0"), @@ -889,7 +890,7 @@ fn test_audit_with_ignore_unreachable() { Some("CVE-2023-67890".to_string()), Some("https://example.com/advisory/3".to_string()), Some("high".to_string()), - )), + ))), ], ); @@ -1106,7 +1107,7 @@ fn test_audit_with_ignore_severity() { #[test] fn test_needs_complete_advisory_load() { let cases: Vec<( - IndexMap<String, Vec<AnySecurityAdvisory>>, + IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>>, IndexMap<String, Option<String>>, bool, )> = vec![ @@ -1121,7 +1122,8 @@ fn test_needs_complete_advisory_load() { // packagist filters are IDs so work fine with partial advisories/2 ( { - let mut m: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut m: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = + IndexMap::new(); m.insert( "vendor1/package1".to_string(), vec![full_advisory(), partial_advisory("1234")], @@ -1140,7 +1142,8 @@ fn test_needs_complete_advisory_load() { // no advisories no need to load any further/2 ( { - let mut m: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut m: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = + IndexMap::new(); m.insert("vendor1/package1".to_string(), vec![]); m }, @@ -1150,7 +1153,8 @@ fn test_needs_complete_advisory_load() { // CVE filter or other non-packagist ones might need to fully load for safety if partial advisories are present ( { - let mut m: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut m: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = + IndexMap::new(); m.insert( "vendor1/package1".to_string(), vec![full_advisory(), partial_advisory("1234")], @@ -1163,7 +1167,8 @@ fn test_needs_complete_advisory_load() { // filter does not trigger load if all advisories are fully loaded ( { - let mut m: IndexMap<String, Vec<AnySecurityAdvisory>> = IndexMap::new(); + let mut m: IndexMap<String, Vec<std::rc::Rc<AnySecurityAdvisory>>> = + IndexMap::new(); m.insert("vendor1/package1".to_string(), vec![full_advisory()]); m.insert( "vendor1/package2".to_string(), |