702cb19 · bat · git.iko.soy

git.iko.soy/bat

Rename error module

commit702cb198da986203aefe9c2fa6d024d8cbe96346 authorsharkdp <davidpeter@web.de> dateWed 22 Apr 2020, 21:45 (7 years ago) parent5f82641

16 files changed+16−16

compare with master

unifiedsplit

src/assets.rs+1−1 src/assets_metadata.rs+1−1 src/bin/bat/app.rs+1−1 src/bin/bat/assets.rs+1−1 src/bin/bat/config.rs+1−1 src/bin/bat/main.rs+1−1 src/controller.rs+1−1 src/errors.rs → src/error.rs src/input.rs+1−1 src/lib.rs+2−2 src/line_range.rs+1−1 src/output.rs+1−1 src/pretty_printer.rs+1−1 src/printer.rs+1−1 src/style.rs+1−1 src/syntax_mapping.rs+1−1

src/assets.rs+1−1

@@ -9,7 +9,7 @@ use syntect::highlighting::{Theme, ThemeSet};

99use syntect::parsing::{SyntaxReference, SyntaxSet, SyntaxSetBuilder};

1010

1111use crate::assets_metadata::AssetsMetadata;

12−use crate::errors::*;

12+use crate::error::*;

1313use crate::input::{InputReader, OpenedInput, OpenedInputKind};

1414use crate::syntax_mapping::{MappingTarget, SyntaxMapping};

1515

src/assets_metadata.rs+1−1

@@ -5,7 +5,7 @@ use std::time::SystemTime;

55use semver::Version;

66use serde::{Deserialize, Serialize};

8−use crate::errors::*;

8+use crate::error::*;

1010#[derive(Debug, PartialEq, Default, Serialize, Deserialize)]

1111pub struct AssetsMetadata {

src/bin/bat/app.rs+1−1

@@ -16,7 +16,7 @@ use console::Term;

1616use bat::{

1717 assets::HighlightingAssets,

1818 config::{Config, PagingMode},

19− errors::*,

19+ error::*,

2020 input::Input,

2121 line_range::{HighlightedLineRanges, LineRange, LineRanges},

2222 style::{StyleComponent, StyleComponents},

src/bin/bat/assets.rs+1−1

@@ -7,7 +7,7 @@ use crate::directories::PROJECT_DIRS;

88use bat::assets::HighlightingAssets;

99use bat::assets_metadata::AssetsMetadata;

10−use bat::errors::*;

10+use bat::error::*;

1111

1212pub fn config_dir() -> Cow<'static, str> {

1313 PROJECT_DIRS.config_dir().to_string_lossy()

src/bin/bat/config.rs+1−1

@@ -14,7 +14,7 @@ pub fn config_file() -> PathBuf {

1414 .unwrap_or_else(|| PROJECT_DIRS.config_dir().join("config"))

1515}

1616

17−pub fn generate_config_file() -> bat::errors::Result<()> {

17+pub fn generate_config_file() -> bat::error::Result<()> {

1818 let config_file = config_file();

1919 if config_file.exists() {

2020 println!(

src/bin/bat/main.rs+1−1

@@ -29,7 +29,7 @@ use bat::{

2929 assets::HighlightingAssets,

3030 config::Config,

3131 controller::Controller,

32− errors::*,

32+ error::*,

3333 input::Input,

3434 style::{StyleComponent, StyleComponents},

3535};

src/controller.rs+1−1

@@ -4,7 +4,7 @@ use crate::assets::HighlightingAssets;

44use crate::config::Config;

55#[cfg(feature = "paging")]

66use crate::config::PagingMode;

7−use crate::errors::*;

7+use crate::error::*;

88use crate::input::{Input, InputKind, InputReader, OpenedInput};

99use crate::line_range::{LineRanges, RangeCheckResult};

1010use crate::output::OutputType;

src/errors.rs → src/error.rsrenamed

The content is the same.

src/input.rs+1−1

@@ -4,7 +4,7 @@ use std::io::{self, BufRead, BufReader, Read};

55use content_inspector::{self, ContentType};

7−use crate::errors::*;

7+use crate::error::*;

99const THEME_PREVIEW_FILE: &[u8] = include_bytes!("../assets/theme_preview.rs");

1010

src/lib.rs+2−2

@@ -15,7 +15,7 @@

1515//! .input_from_bytes(b"<span style=\"color: #ff00cc\">Hello world!</span>\n")

1616//! .language("html")

1717//! .print()

18−//! .expect("no errors");

18+//! .unwrap();

1919//! ```

2020

2121pub mod assets;

@@ -24,7 +24,7 @@ pub mod config;

2424pub mod controller;

2525mod decorations;

2626mod diff;

27−pub mod errors;

27+pub mod error;

2828pub mod input;

2929mod less;

3030pub mod line_range;

src/line_range.rs+1−1

@@ -1,4 +1,4 @@

1−use crate::errors::*;

1+use crate::error::*;

33#[derive(Debug, Clone)]

44pub struct LineRange {

src/output.rs+1−1

@@ -4,7 +4,7 @@ use std::process::Child;

55#[cfg(feature = "paging")]

66use crate::config::PagingMode;

7−use crate::errors::*;

7+use crate::error::*;

88#[cfg(feature = "paging")]

99use crate::less::retrieve_less_version;

1010

src/pretty_printer.rs+1−1

@@ -7,7 +7,7 @@ use crate::{

77 assets::HighlightingAssets,

88 config::Config,

99 controller::Controller,

10− errors::Result,

10+ error::Result,

1111 input::Input,

1212 line_range::{HighlightedLineRanges, LineRanges},

1313 style::{StyleComponent, StyleComponents},

src/printer.rs+1−1

@@ -25,7 +25,7 @@ use crate::decorations::LineChangesDecoration;

2525use crate::decorations::{Decoration, GridBorderDecoration, LineNumberDecoration};

2626#[cfg(feature = "git")]

2727use crate::diff::{get_git_diff, LineChanges};

28−use crate::errors::*;

28+use crate::error::*;

2929use crate::input::{OpenedInput, OpenedInputKind};

3030use crate::line_range::RangeCheckResult;

3131use crate::preprocessor::{expand_tabs, replace_nonprintable};

src/style.rs+1−1

@@ -1,7 +1,7 @@

11use std::collections::HashSet;

22use std::str::FromStr;

4−use crate::errors::*;

4+use crate::error::*;

66#[derive(Debug, Eq, PartialEq, Copy, Clone, Hash)]

77pub enum StyleComponent {

src/syntax_mapping.rs+1−1

@@ -1,6 +1,6 @@

11use std::path::Path;

3−use crate::errors::Result;

3+use crate::error::Result;

55use globset::{Candidate, GlobBuilder, GlobMatcher};