Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove tokio01::codec #3095

Merged
merged 33 commits into from
Jul 23, 2020
Merged

chore: remove tokio01::codec #3095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a4b0362
statsd: remove tokio01 codec
fanatid Jul 15, 2020
060105c
tokio-openssl: update with deprecate
fanatid Jul 16, 2020
4c2e0f4
test_util: remove old codec
fanatid Jul 16, 2020
124d25e
benches/files: update codec
fanatid Jul 17, 2020
1c6d856
tests/syslog: update codec
fanatid Jul 17, 2020
2aa9e4f
tests/tcp: remove codec
fanatid Jul 17, 2020
749dad7
sinks/util/unix: remove codec from test
fanatid Jul 17, 2020
a1700c9
sinks/util/unix: remove codec
fanatid Jul 17, 2020
9ece824
sinks/util/tcp: remove codec
fanatid Jul 17, 2020
db9ab6d
sources/socket/mod: remove tokio-uds
fanatid Jul 17, 2020
edc626f
sources/socket/unix: update codec
fanatid Jul 18, 2020
3d9a874
sources/util/tcp: update codec
fanatid Jul 18, 2020
b874167
sources/syslog: fix new codec
fanatid Jul 18, 2020
9ec7935
sources/syslog: update codec
fanatid Jul 18, 2020
7349085
sources/socket/udp: update codec
fanatid Jul 18, 2020
f916a55
remove crate codec01
fanatid Jul 18, 2020
b709dc7
add tokio-util/udp to features
fanatid Jul 18, 2020
3917d95
sources/statsd: update codec
fanatid Jul 18, 2020
61071b1
remove unused tokio01 features: udp, codec
fanatid Jul 18, 2020
4e3bff0
cargo-fmt
fanatid Jul 18, 2020
880f7d6
remove already enabled feature
fanatid Jul 19, 2020
d9dc853
add shutdown to sources/util/unix
fanatid Jul 19, 2020
d7ca86b
fix uds feature for tests
fanatid Jul 19, 2020
99b8809
fix uds feature again
fanatid Jul 19, 2020
e1b6d79
Merge remote-tracking branch 'upstream/master' into tokio01-codec-remove
fanatid Jul 20, 2020
3cf9fb5
fix udp socket source
fanatid Jul 20, 2020
56d8122
fix syslog test for unix socket
fanatid Jul 20, 2020
fc8cd1a
Merge remote-tracking branch 'upstream/master' into tokio01-codec-remove
fanatid Jul 21, 2020
fc4c810
remove not required delay_for in statsd
fanatid Jul 21, 2020
4e5c05c
add type annotations for long get_ref/get_mut chains
fanatid Jul 21, 2020
9c57084
add explicit type to sinks/util
fanatid Jul 22, 2020
90a2cb3
Merge remote-tracking branch 'upstream/master' into tokio01-codec-remove
fanatid Jul 22, 2020
b4bd844
Merge remote-tracking branch 'upstream/master' into tokio01-codec-remove
fanatid Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 19 additions & 89 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ extended-description-file = "target/debian-extended-description.txt"
[workspace]
members = [
".",
"lib/codec01",
"lib/file-source",
"lib/tracing-limit",
"lib/vector-wasm",
Expand All @@ -37,16 +36,16 @@ members = [
[dependencies]
# Internal libs
codec = { path = "lib/codec" }
codec01 = { path = "lib/codec01" }
file-source = { path = "lib/file-source" }
tracing-limit = { path = "lib/tracing-limit" }

# Tokio / Futures
futures01 = { package = "futures", version = "0.1.25" }
futures = { version = "0.3", default-features = false, features = ["compat", "io-compat"] }
tokio01 = { package = "tokio", version = "0.1.22", features = ["io", "uds", "tcp", "rt-full", "experimental-tracing", "codec", "udp", "sync", "fs"], default-features = false }
tokio01 = { package = "tokio", version = "0.1.22", features = ["io", "tcp", "rt-full", "experimental-tracing", "sync"], default-features = false }
tokio = { version = "0.2.13", features = ["blocking", "fs", "sync", "macros", "test-util", "rt-core", "io-std"] }
tokio-openssl = "0.3.0"
tokio-openssl03 = { package = "tokio-openssl", version = "0.3.0" }
tokio-openssl = "0.4.0"
tokio-retry = "0.2.0"
tokio-signal = "0.2.7"
tokio-compat = { version = "0.1", features = ["rt-full"] }
Expand Down Expand Up @@ -113,7 +112,6 @@ typetag = "0.1"
toml = "0.4"
syslog = "5"
syslog_loose = { version = "0.3.0", optional = true }
tokio-uds = { version = "0.2.5", optional = true }
derive_is_enum_variant = "0.1.1"
leveldb = { git = "https://github.com/timberio/leveldb", optional = true, default-features = false }
db-key = "0.0.5"
Expand Down Expand Up @@ -263,9 +261,9 @@ sources-journald = []
sources-kafka = []
sources-logplex = ["warp", "sources-tls"]
sources-prometheus = []
sources-socket = ["bytesize", "listenfd", "tokio-uds", "sources-tls"]
sources-socket = ["bytesize", "listenfd", "tokio/uds", "tokio-util/udp", "sources-tls"]
sources-splunk_hec = ["bytesize", "warp", "sources-tls"]
sources-statsd = []
sources-statsd = ["tokio-util/udp"]
sources-stdin = ["bytesize"]
sources-syslog = ["sources-socket", "syslog_loose"]
sources-tls = ["sources-http", "sources-logplex", "sources-socket", "sources-splunk_hec"]
Expand Down Expand Up @@ -382,10 +380,10 @@ sinks-loki = ["bytesize"]
sinks-new_relic_logs = ["bytesize", "sinks-http"]
sinks-prometheus = []
sinks-sematext_logs = ["sinks-elasticsearch"]
sinks-socket = ["tokio-uds"]
sinks-socket = ["tokio/uds"]
sinks-papertrail = ["sinks-socket"]
sinks-splunk_hec = ["bytesize"]
sinks-statsd = []
sinks-statsd = ["tokio-util/udp"]
sinks-vector = []
sinks-pulsar = ["pulsar"]

Expand Down
Loading