diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-03-25 09:47:16 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-03-25 09:47:16 +0100 |
commit | 8a9ee7a63f2b34f0d9d19c19598c75213114cf80 (patch) | |
tree | e3822f392d3d7466dbbb0e51a70787d69b50d098 | |
parent | 9d543a5a2e48c14f502a0e89c9e7d690bce6b45e (diff) | |
parent | b7d77b3c029ff11763454640efd7106eb6f957fb (diff) |
Merge branch 'update-mdcat' into master
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | lib/entry/libimagentryview/Cargo.toml | 6 | ||||
-rw-r--r-- | lib/entry/libimagentryview/src/builtin/md.rs | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index f0ace66c..08535db3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: script: - cd doc/user && mdbook build || exit 1 - language: rust - rust: 1.37.0 + rust: 1.40.0 cache: directories: - /home/travis/.cargo @@ -38,7 +38,7 @@ matrix: - cargo build --all --all-features -j 1 || exit 1 - cargo test --all --all-features -j 1 || exit 1 - language: rust - rust: 1.38.0 + rust: 1.41.0 cache: directories: - /home/travis/.cargo diff --git a/lib/entry/libimagentryview/Cargo.toml b/lib/entry/libimagentryview/Cargo.toml index 280eb13f..8b924cef 100644 --- a/lib/entry/libimagentryview/Cargo.toml +++ b/lib/entry/libimagentryview/Cargo.toml @@ -30,16 +30,16 @@ libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" libimagerror = { version = "0.10.0", path = "../../../lib/core/libimagerror" } libimagentryedit = { version = "0.10.0", path = "../../../lib/entry/libimagentryedit" } -mdcat = { version = "0.13.0", optional = true } +mdcat = { version = "0.15.0", optional = true } [dependencies.pulldown-cmark] -version = "^0.4" +version = "^0.7" optional = true default-features = false features = [] [dependencies.syntect] -version = "3.2.0" +version = "3" optional = true default-features = false features = ["parsing", "assets", "dump-load"] diff --git a/lib/entry/libimagentryview/src/builtin/md.rs b/lib/entry/libimagentryview/src/builtin/md.rs index 065ca28d..b4bd13c6 100644 --- a/lib/entry/libimagentryview/src/builtin/md.rs +++ b/lib/entry/libimagentryview/src/builtin/md.rs @@ -26,7 +26,7 @@ use mdcat::{ResourceAccess, TerminalCapabilities, TerminalSize}; use pulldown_cmark::Parser; use syntect::parsing::SyntaxSet; use anyhow::Result; -use anyhow::Error; +use anyhow::format_err; use crate::viewer::Viewer; @@ -56,15 +56,16 @@ impl<'a> Viewer for MarkdownViewer<'a> { let parser = Parser::new(e.get_content()); let base_dir = self.rt.rtp(); let syntax_set = SyntaxSet::load_defaults_newlines(); + let capa = TerminalCapabilities::ansi(); ::mdcat::push_tty(sink, - TerminalCapabilities::ansi(), + &capa, self.termsize, parser, base_dir, self.resource_access, syntax_set) - .map_err(|e| Error::from(e.compat())) + .map_err(|_| format_err!("Failed while formatting markdown")) } } |