chore(tvix): drop json feature for tracing-subscriber

Drop the (unused) feature flags here, and get rid of some crate
dependencies.

Change-Id: Id64852b498725467d56abb12b548301cfba6a760
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11678
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-05-16 21:28:07 +02:00 committed by clbot
parent d65e6df3ab
commit 9a704acda5
5 changed files with 5 additions and 58 deletions

13
tvix/Cargo.lock generated
View file

@ -4009,16 +4009,6 @@ dependencies = [
"web-time", "web-time",
] ]
[[package]]
name = "tracing-serde"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
dependencies = [
"serde",
"tracing-core",
]
[[package]] [[package]]
name = "tracing-subscriber" name = "tracing-subscriber"
version = "0.3.18" version = "0.3.18"
@ -4029,15 +4019,12 @@ dependencies = [
"nu-ansi-term", "nu-ansi-term",
"once_cell", "once_cell",
"regex", "regex",
"serde",
"serde_json",
"sharded-slab", "sharded-slab",
"smallvec", "smallvec",
"thread_local", "thread_local",
"tracing", "tracing",
"tracing-core", "tracing-core",
"tracing-log", "tracing-log",
"tracing-serde",
] ]
[[package]] [[package]]

View file

@ -12545,30 +12545,6 @@ rec {
}; };
resolvedDefaultFeatures = [ "default" "metrics" "smallvec" "tracing-log" ]; resolvedDefaultFeatures = [ "default" "metrics" "smallvec" "tracing-log" ];
}; };
"tracing-serde" = rec {
crateName = "tracing-serde";
version = "0.1.3";
edition = "2018";
sha256 = "1qfr0va69djvxqvjrx4vqq7p6myy414lx4w1f6amcn0hfwqj2sxw";
authors = [
"Tokio Contributors <team@tokio.rs>"
];
dependencies = [
{
name = "serde";
packageId = "serde";
}
{
name = "tracing-core";
packageId = "tracing-core";
}
];
features = {
"valuable" = [ "valuable_crate" "valuable-serde" "tracing-core/valuable" ];
"valuable-serde" = [ "dep:valuable-serde" ];
"valuable_crate" = [ "dep:valuable_crate" ];
};
};
"tracing-subscriber" = rec { "tracing-subscriber" = rec {
crateName = "tracing-subscriber"; crateName = "tracing-subscriber";
version = "0.3.18"; version = "0.3.18";
@ -12602,16 +12578,6 @@ rec {
usesDefaultFeatures = false; usesDefaultFeatures = false;
features = [ "std" "unicode-case" "unicode-perl" ]; features = [ "std" "unicode-case" "unicode-perl" ];
} }
{
name = "serde";
packageId = "serde";
optional = true;
}
{
name = "serde_json";
packageId = "serde_json";
optional = true;
}
{ {
name = "sharded-slab"; name = "sharded-slab";
packageId = "sharded-slab"; packageId = "sharded-slab";
@ -12645,11 +12611,6 @@ rec {
usesDefaultFeatures = false; usesDefaultFeatures = false;
features = [ "log-tracer" "std" ]; features = [ "log-tracer" "std" ];
} }
{
name = "tracing-serde";
packageId = "tracing-serde";
optional = true;
}
]; ];
devDependencies = [ devDependencies = [
{ {
@ -12695,7 +12656,7 @@ rec {
"valuable-serde" = [ "dep:valuable-serde" ]; "valuable-serde" = [ "dep:valuable-serde" ];
"valuable_crate" = [ "dep:valuable_crate" ]; "valuable_crate" = [ "dep:valuable_crate" ];
}; };
resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "json" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "serde" "serde_json" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" "tracing-serde" ]; resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" ];
}; };
"try-lock" = rec { "try-lock" = rec {
crateName = "try-lock"; crateName = "try-lock";
@ -13101,7 +13062,6 @@ rec {
{ {
name = "tracing-subscriber"; name = "tracing-subscriber";
packageId = "tracing-subscriber"; packageId = "tracing-subscriber";
features = [ "json" ];
} }
{ {
name = "tvix-build"; name = "tvix-build";
@ -13708,7 +13668,7 @@ rec {
{ {
name = "tracing-subscriber"; name = "tracing-subscriber";
packageId = "tracing-subscriber"; packageId = "tracing-subscriber";
features = [ "env-filter" "json" ]; features = [ "env-filter" ];
} }
{ {
name = "tvix-castore"; name = "tvix-castore";

View file

@ -14,7 +14,7 @@ tokio-listener = { version = "0.4.1", features = [ "tonic011" ] }
tonic = { version = "0.11.0", features = ["tls", "tls-roots"] } tonic = { version = "0.11.0", features = ["tls", "tls-roots"] }
tvix-castore = { path = "../castore" } tvix-castore = { path = "../castore" }
tracing = "0.1.37" tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16" } tracing-subscriber = "0.3.16"
url = "2.4.0" url = "2.4.0"
[dependencies.tonic-reflection] [dependencies.tonic-reflection]

View file

@ -21,7 +21,7 @@ rustyline = "10.0.0"
thiserror = "1.0.38" thiserror = "1.0.38"
tokio = "1.28.0" tokio = "1.28.0"
tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_info"] } tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_info"] }
tracing-subscriber = { version = "0.3.16", features = ["json"] } tracing-subscriber = "0.3.16"
[dependencies.wu-manber] [dependencies.wu-manber]
git = "https://github.com/tvlfyi/wu-manber.git" git = "https://github.com/tvlfyi/wu-manber.git"

View file

@ -36,7 +36,7 @@ tonic = { version = "0.11.0", features = ["tls", "tls-roots"] }
tower = "0.4.13" tower = "0.4.13"
tracing = "0.1.37" tracing = "0.1.37"
tracing-opentelemetry = "0.23.0" tracing-opentelemetry = "0.23.0"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] } tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
tvix-castore = { path = "../castore" } tvix-castore = { path = "../castore" }
url = "2.4.0" url = "2.4.0"
walkdir = "2.4.0" walkdir = "2.4.0"