diff options
| -rw-r--r-- | front_end/src/crate_page.rs | 2 | ||||
| -rw-r--r-- | front_end/templates/cat_page.rs.html | 2 | ||||
| -rw-r--r-- | front_end/templates/crate_page.rs.html | 2 | ||||
| -rw-r--r-- | kitchen_sink/src/lib_kitchen_sink.rs | 2 | ||||
| -rw-r--r-- | reindex/src/bin/reindex_crates.rs | 2 | ||||
| -rw-r--r-- | rich_crate/src/rich_crate_version.rs | 20 |
6 files changed, 10 insertions, 20 deletions
diff --git a/front_end/src/crate_page.rs b/front_end/src/crate_page.rs index fcdc772..d1fcd69 100644 --- a/front_end/src/crate_page.rs +++ b/front_end/src/crate_page.rs @@ -114,7 +114,7 @@ impl<'a> CratePage<'a> { } pub fn page(&self, url: &Urler) -> Page { - let keywords = self.ver.keywords(Include::Cleaned).collect::<Vec<_>>().join(", "); + let keywords = self.ver.keywords().collect::<Vec<_>>().join(", "); Page { title: self.page_title(), keywords: if keywords != "" { Some(keywords) } else { None }, diff --git a/front_end/templates/cat_page.rs.html b/front_end/templates/cat_page.rs.html index 852fdd4..b93738d 100644 --- a/front_end/templates/cat_page.rs.html +++ b/front_end/templates/cat_page.rs.html @@ -97,7 +97,7 @@ <span class=downloads title="@downloads recent downloads">@if let Some((num,unit)) = Some(p.downloads(*downloads)) {@num<b>@unit</b>}</span> } @:labels(c, (false, false)) - @for k in c.keywords(Include::Cleaned) { + @for k in c.keywords() { <span class=k><span>#</span>@k</span> } </div> diff --git a/front_end/templates/crate_page.rs.html b/front_end/templates/crate_page.rs.html index 2e23d9b..a7235a4 100644 --- a/front_end/templates/crate_page.rs.html +++ b/front_end/templates/crate_page.rs.html @@ -27,7 +27,7 @@ </h1> › @if c.ver.has_categories() { - <span class="categories @if c.ver.keywords(Include::Cleaned).next().is_some() {has-keywords}" role="navigaton" aria-label="Categories"> + <span class="categories @if c.ver.keywords().next().is_some() {has-keywords}" role="navigaton" aria-label="Categories"> @for (last, (major, cat)) in c.category_slugs_unique().iter().enumerate().identify_last() { @for (last, (i, subcat)) in cat.iter().enumerate().identify_last() { @if major < 2 { diff --git a/kitchen_sink/src/lib_kitchen_sink.rs b/kitchen_sink/src/lib_kitchen_sink.rs index d3d9ab8..2be4b04 100644 --- a/kitchen_sink/src/lib_kitchen_sink.rs +++ b/kitchen_sink/src/lib_kitchen_sink.rs @@ -1757,7 +1757,7 @@ impl KitchenSink { /// True if there are multiple crates with that keyword. Populated first. pub fn keywords_populated(&self, krate: &RichCrateVersion) -> Vec<(String, bool)> { - let mut keywords: Vec<_> = krate.keywords(Include::Cleaned) + let mut keywords: Vec<_> = krate.keywords() .map(|k| { let populated = self.crate_db.crates_with_keyword(&k.to_lowercase()).unwrap() >= 3; (k.to_owned(), populated) diff --git a/reindex/src/bin/reindex_crates.rs b/reindex/src/bin/reindex_crates.rs index 050b441..0c30fa6 100644 --- a/reindex/src/bin/reindex_crates.rs +++ b/reindex/src/bin/reindex_crates.rs @@ -130,7 +130,7 @@ fn index_crate(crates: &KitchenSink, c: &Origin, renderer: &Renderer, search_sen } fn index_search(indexer: &mut Indexer, renderer: &Renderer, k: &RichCrateVersion, downloads_per_month: usize, score: f64) -> Result<(), failure::Error> { - let keywords: Vec<_> = k.keywords(Include::Cleaned).collect(); + let keywords: Vec<_> = k.keywords().collect(); let mut lib_tmp = None; let readme = k.readme().map(|readme| &readme.markup).or_else(|| { diff --git a/rich_crate/src/rich_crate_version.rs b/rich_crate/src/rich_crate_version.rs index c11b571..88d875f 100644 --- a/rich_crate/src/rich_crate_version.rs +++ b/rich_crate/src/rich_crate_version.rs @@ -30,7 +30,6 @@ pub struct RichCrateVersion { pub enum Include { Cleaned, AuthoritativeOnly, - RawCargoTomlOnly, } /// Data for a specific version of a crate. @@ -97,10 +96,6 @@ impl RichCrateVersion { &self.package().categories }), Include::AuthoritativeOnly => Categories::fixed_category_slugs(&self.package().categories), - Include::RawCargoTomlOnly => { - let tmp: Vec<_> = self.package().categories.iter().map(From::from).collect(); - tmp - }, } .into_iter() } @@ -125,14 +120,9 @@ impl RichCrateVersion { } /// Either original keywords or guessed ones - pub fn keywords(&self, include: Include) -> impl Iterator<Item = &str> { - match include { - Include::RawCargoTomlOnly => &self.package().keywords, - Include::AuthoritativeOnly => { - if self.package().keywords.is_empty() { self.derived.github_keywords.as_ref() } else { None }.unwrap_or(&self.package().keywords) - }, - Include::Cleaned => self.derived.keywords.as_ref().unwrap_or(&self.package().keywords), - } + pub fn keywords(&self) -> impl Iterator<Item = &str> { + self.derived.keywords.as_ref() + .unwrap_or(&self.package().keywords) .iter() .map(|s| s.as_str()) } @@ -293,8 +283,8 @@ impl RichCrateVersion { } pub fn is_no_std(&self) -> bool { - self.category_slugs(Include::RawCargoTomlOnly).any(|c| c == "no-std") - || self.keywords(Include::RawCargoTomlOnly).any(|k| k == "no-std" || k == "no_std") + self.package().categories.iter().any(|c| c == "no-std") + || self.package().keywords.iter().any(|k| k == "no-std" || k == "no_std") || self.features().iter().any(|(k,_)| k == "no-std" || k == "no_std") } |