diff --git a/Project.toml b/Project.toml index 617e023..6de4ec8 100644 --- a/Project.toml +++ b/Project.toml @@ -11,7 +11,6 @@ BufferedStreams = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" -TranscodingStreams = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" [compat] Aqua = "0.8" @@ -19,7 +18,6 @@ BufferedStreams = "1.2" Dates = "1" EnumX = "1" JET = "0.4, 0.5, 0.6, 0.7, 0.8" -TranscodingStreams = "0.9, 0.10" TOML = "1" Test = "1" julia = "1.6" diff --git a/src/ProtoBuf.jl b/src/ProtoBuf.jl index bab4f48..8144f66 100644 --- a/src/ProtoBuf.jl +++ b/src/ProtoBuf.jl @@ -1,6 +1,5 @@ module ProtoBuf import EnumX -import TranscodingStreams import BufferedStreams using TOML diff --git a/src/codec/Codecs.jl b/src/codec/Codecs.jl index 0a11317..e4c01af 100644 --- a/src/codec/Codecs.jl +++ b/src/codec/Codecs.jl @@ -1,7 +1,6 @@ module Codecs using BufferedStreams: BufferedOutputStream, BufferedInputStream -using TranscodingStreams: TranscodingStream @enum(WireType::UInt32, VARINT=0, FIXED64=1, LENGTH_DELIMITED=2, START_GROUP=3, END_GROUP=4, FIXED32=5) diff --git a/src/codec/vbyte.jl b/src/codec/vbyte.jl index 6a505fe..549adbb 100644 --- a/src/codec/vbyte.jl +++ b/src/codec/vbyte.jl @@ -1,5 +1,5 @@ # https://discourse.julialang.org/t/allocation-due-to-noinline-for-unsafe-read-and-unsafe-write-in-io-jl/69421 -@inline function _unsafe_write(io::S, ref::Ref{T}, nb::Integer) where {T,S<:Union{TranscodingStream,BufferedOutputStream,BufferedInputStream}} +@inline function _unsafe_write(io::S, ref::Ref{T}, nb::Integer) where {T,S<:Union{BufferedOutputStream,BufferedInputStream}} GC.@preserve ref unsafe_write(io, Base.unsafe_convert(Ref{T}, ref)::Ptr, nb) end @noinline _reached_maxsize_error(io::IOBuffer, nb) = throw(ArgumentError("Cannot write $nb bytes to IOBuffer at position $(position(io)) with maxsize $(io.maxsize)")) diff --git a/src/lexing/Lexers.jl b/src/lexing/Lexers.jl index 1033578..49767e1 100644 --- a/src/lexing/Lexers.jl +++ b/src/lexing/Lexers.jl @@ -1,7 +1,6 @@ module Lexers import ..Tokens -import ..TranscodingStreams const EOF_CHAR = typemax(Char) @@ -45,7 +44,6 @@ end filepath(l::Lexer) = l.filepath filepath(io::IOStream) = abspath(io.name[7:end-1]) -filepath(io::TranscodingStreams.TranscodingStream) = filepath(io.stream) filepath(io::IO) = "" # TODO: print nicer, clickable token locations with this function, esp for errors. # How to get the Lexers' IO to the tokens' show method? diff --git a/test/test_protojl.jl b/test/test_protojl.jl index ace6381..0eaa284 100644 --- a/test/test_protojl.jl +++ b/test/test_protojl.jl @@ -106,7 +106,6 @@ end module TestComplexMessage using Test using ProtoBuf -using TranscodingStreams using BufferedStreams function roundtrip_iobuffer(input, f_in=identity, f_out=identity)