git.iko.soy/bat
on master help sign in
Hide some methods from HighlightingAssets
commit094c526a0e5264b509f55c0338970e2f9ed29e9f authorsharkdp <davidpeter@web.de> dateSat 21 Mar 2020, 20:16 (7 years ago) parent62f2d0c
2 files changed+6−6
compare with master
unifiedsplit
src/assets.rs+4−3 src/bin/bat/main.rs+2−3
src/assets.rs+4−3
@@ -142,11 +142,11 @@ impl HighlightingAssets {
142142 self.syntax_set.syntaxes()
143143 }
144144
145− pub fn themes(&self) -> &BTreeMap<String, Theme> {
146− &self.theme_set.themes
145+ pub fn themes(&self) -> impl Iterator<Item = &String> {
146+ self.theme_set.themes.keys()
147147 }
148148
149− pub fn get_theme(&self, theme: &str) -> &Theme {
149+ pub(crate) fn get_theme(&self, theme: &str) -> &Theme {
150150 match self.theme_set.themes.get(theme) {
151151 Some(theme) => theme,
152152 None => {
@@ -161,6 +161,7 @@ impl HighlightingAssets {
161161 }
162162 }
163163
164+ #[doc(hidden)]
164165 pub fn get_syntax(
165166 &self,
166167 language: Option<&str>,
src/bin/bat/main.rs+2−3
@@ -121,7 +121,6 @@ pub fn list_languages(config: &Config) -> Result<()> {
121121
122122pub fn list_themes(cfg: &Config) -> Result<()> {
123123 let assets = assets_from_cache_or_binary();
124− let themes = assets.themes();
125124 let mut config = cfg.clone();
126125 let mut style = HashSet::new();
127126 style.insert(OutputComponent::Plain);
@@ -132,7 +131,7 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
132131 let mut stdout = stdout.lock();
133132
134133 if config.colored_output {
135− for (theme, _) in themes.iter() {
134+ for theme in assets.themes() {
136135 writeln!(
137136 stdout,
138137 "Theme: {}\n",
@@ -143,7 +142,7 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
143142 writeln!(stdout)?;
144143 }
145144 } else {
146− for (theme, _) in themes.iter() {
145+ for theme in assets.themes() {
147146 writeln!(stdout, "{}", theme)?;
148147 }
149148 }