From 63393035691fb5560297713e30f2a6cabf844c24 Mon Sep 17 00:00:00 2001 From: Shuhei Kadowaki Date: Wed, 18 Mar 2020 08:53:25 +0900 Subject: [PATCH] rm Compat --- Project.toml | 2 -- src/Weave.jl | 1 - src/chunks.jl | 10 +++------- src/display_methods.jl | 7 +++---- src/format.jl | 1 - src/run.jl | 6 +++--- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Project.toml b/Project.toml index a339c80..12f1fad 100644 --- a/Project.toml +++ b/Project.toml @@ -4,7 +4,6 @@ version = "0.9.3" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" -Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Highlights = "eafb193a-b7ab-5a9e-9068-77385905fa72" JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" @@ -17,7 +16,6 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6" [compat] -Compat = "2, 3" Highlights = "0.3.1, 0.4" JSON = "0.21" Mustache = "0.4.1, 0.5, 1" diff --git a/src/Weave.jl b/src/Weave.jl index e2e5e49..7149a7e 100644 --- a/src/Weave.jl +++ b/src/Weave.jl @@ -1,6 +1,5 @@ module Weave import Highlights -using Compat using Requires function __init__() diff --git a/src/chunks.jl b/src/chunks.jl index 717c9d4..f918bba 100644 --- a/src/chunks.jl +++ b/src/chunks.jl @@ -1,4 +1,3 @@ -using Compat import Mustache abstract type WeaveChunk end @@ -82,11 +81,8 @@ mutable struct InlineCode <: Inline end end -mutable struct TermResult -end +mutable struct TermResult end -mutable struct ScriptResult -end +mutable struct ScriptResult end -mutable struct CollectResult -end +mutable struct CollectResult end diff --git a/src/display_methods.jl b/src/display_methods.jl index 62cd0c1..a9bf401 100644 --- a/src/display_methods.jl +++ b/src/display_methods.jl @@ -1,4 +1,3 @@ -using Compat using Markdown import .WeaveMarkdown @@ -50,11 +49,11 @@ function Base.display(report::Report, data) if Base.invokelatest(showable, m, data) try if !istextmime(m) - Compat.invokelatest(display, report, m, data) + Base.invokelatest(display, report, m, data) elseif report.cur_chunk.options[:term] - Compat.invokelatest(display, report, "text/plain", data) + Base.invokelatest(display, report, "text/plain", data) else - Compat.invokelatest(display, report, m, data) + Base.invokelatest(display, report, m, data) end catch e throw(e) diff --git a/src/format.jl b/src/format.jl index 2c00031..d556e1f 100644 --- a/src/format.jl +++ b/src/format.jl @@ -1,6 +1,5 @@ import Mustache, Highlights import .WeaveMarkdown -using Compat using Dates using Markdown using REPL.REPLCompletions: latex_symbols diff --git a/src/run.jl b/src/run.jl index 9828aa1..d0ec25a 100644 --- a/src/run.jl +++ b/src/run.jl @@ -37,7 +37,7 @@ function Base.run(doc::WeaveDoc; doctype = :auto, if (haskey(doc.format.formatdict, :keep_unicode)) doc.format.formatdict[:keep_unicode] = latex_keep_unicode end - + isdir(doc.cwd) || mkpath(doc.cwd) if occursin("2pdf", doctype) && cache == :off @@ -279,7 +279,7 @@ function eval_chunk(chunk::CodeChunk, report::Report, SandBox::Module) #Run preexecute_hooks for hook in preexecute_hooks - chunk = Compat.invokelatest(hook, chunk) + chunk = Base.invokelatest(hook, chunk) end report.fignum = 1 @@ -294,7 +294,7 @@ function eval_chunk(chunk::CodeChunk, report::Report, SandBox::Module) #Run post_execute chunks for hook in postexecute_hooks - chunk = Compat.invokelatest(hook, chunk) + chunk = Base.invokelatest(hook, chunk) end if chunk.options[:term]