Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pretty-print JSON of server snapshot

Browse source
This commit is contained in:
Antonio Scandurra 2022-05-26 09:34:39 +02:00
parent 742dd75041
commit 3ac6fc89c1
16 changed files with 45 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Cargo.lock generated
View file

@ -416,6 +416,25 @@ dependencies = [
"mime", "mime",
] ]
[[package]]
name = "axum-extra"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75330529f6b27544cedc6089108602a056d016df6aa4f2cb24408d840392ef2d"
dependencies = [
"axum",
"bytes",
"http",
"mime",
"pin-project-lite 0.2.9",
"serde",
"serde_json",
"tower",
"tower-http",
"tower-layer",
"tower-service",
]
[[package]] [[package]]
name = "backtrace" name = "backtrace"
version = "0.3.64" version = "0.3.64"
@ -593,9 +612,9 @@ checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
[[package]] [[package]]
name = "bytes" name = "bytes"
version = "1.0.1" version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
[[package]] [[package]]
name = "cache-padded" name = "cache-padded"
@ -841,6 +860,7 @@ dependencies = [
"async-trait", "async-trait",
"async-tungstenite", "async-tungstenite",
"axum", "axum",
"axum-extra",
"base64 0.13.0", "base64 0.13.0",
"clap 3.1.12", "clap 3.1.12",
"client", "client",
@ -4237,12 +4257,12 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.64" version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"itoa 0.4.7", "itoa 1.0.1",
"ryu", "ryu",
"serde", "serde",
] ]

2
crates/auto_update/Cargo.toml
View file

@ -18,6 +18,6 @@ isahc = "1.7"
lazy_static = "1.4" lazy_static = "1.4"
log = "0.4" log = "0.4"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
smol = "1.2.5" smol = "1.2.5"
tempdir = "0.3.7" tempdir = "0.3.7"

3
crates/collab/Cargo.toml
View file

@ -21,6 +21,7 @@ anyhow = "1.0.40"
async-trait = "0.1.50" async-trait = "0.1.50"
async-tungstenite = "0.16" async-tungstenite = "0.16"
axum = { version = "0.5", features = ["json", "headers", "ws"] } axum = { version = "0.5", features = ["json", "headers", "ws"] }
axum-extra = { version = "0.3", features = ["erased-json"] }
base64 = "0.13" base64 = "0.13"
clap = { version = "3.1", features = ["derive"], optional = true } clap = { version = "3.1", features = ["derive"], optional = true }
envy = "0.4.2" envy = "0.4.2"
@ -70,7 +71,7 @@ ctor = "0.1"
env_logger = "0.8" env_logger = "0.8"
util = { path = "../util" } util = { path = "../util" }
lazy_static = "1.4" lazy_static = "1.4"
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
[features] [features]
seed-support = ["clap", "lipsum", "reqwest"] seed-support = ["clap", "lipsum", "reqwest"]

8
crates/collab/src/api.rs
View file

@ -14,8 +14,8 @@ use axum::{
routing::{get, post, put}, routing::{get, post, put},
Extension, Json, Router, Extension, Json, Router,
}; };
use axum_extra::response::ErasedJson;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value;
use std::sync::Arc; use std::sync::Arc;
use tower::ServiceBuilder; use tower::ServiceBuilder;
use tracing::instrument; use tracing::instrument;
@ -179,10 +179,10 @@ async fn trace_panic(panic: Json<Panic>) -> Result<()> {
Ok(()) Ok(())
} }
async fn get_rpc_server_snapshot<'a>( async fn get_rpc_server_snapshot(
Extension(rpc_server): Extension<Arc<rpc::Server>>, Extension(rpc_server): Extension<Arc<rpc::Server>>,
) -> Result<Json<Value>> { ) -> Result<ErasedJson> {
Ok(Json(serde_json::to_value(rpc_server.snapshot().await)?)) Ok(ErasedJson::pretty(rpc_server.snapshot().await))
} }
#[derive(Deserialize)] #[derive(Deserialize)]

2
crates/command_palette/Cargo.toml
View file

@ -22,7 +22,7 @@ workspace = { path = "../workspace" }
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
editor = { path = "../editor", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] }
project = { path = "../project", features = ["test-support"] } project = { path = "../project", features = ["test-support"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
workspace = { path = "../workspace", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] }
ctor = "0.1" ctor = "0.1"
env_logger = "0.8" env_logger = "0.8"

2
crates/file_finder/Cargo.toml
View file

@ -21,7 +21,7 @@ postage = { version = "0.4.1", features = ["futures-traits"] }
[dev-dependencies] [dev-dependencies]
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
workspace = { path = "../workspace", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] }
ctor = "0.1" ctor = "0.1"
env_logger = "0.8" env_logger = "0.8"

2
crates/gpui/Cargo.toml
View file

@ -37,7 +37,7 @@ rand = "0.8.3"
resvg = "0.14" resvg = "0.14"
seahash = "4.1" seahash = "4.1"
serde = { version = "1.0.125", features = ["derive"] } serde = { version = "1.0.125", features = ["derive"] }
serde_json = "1.0.64" serde_json = "1.0"
smallvec = { version = "1.6", features = ["union"] } smallvec = { version = "1.6", features = ["union"] }
smol = "1.2" smol = "1.2"
time = { version = "0.3" } time = { version = "0.3" }

2
crates/picker/Cargo.toml
View file

@ -17,7 +17,7 @@ workspace = { path = "../workspace" }
[dev-dependencies] [dev-dependencies]
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
workspace = { path = "../workspace", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] }
ctor = "0.1" ctor = "0.1"
env_logger = "0.8" env_logger = "0.8"

2
crates/project/Cargo.toml
View file

@ -41,7 +41,7 @@ postage = { version = "0.4.1", features = ["futures-traits"] }
rand = "0.8.3" rand = "0.8.3"
regex = "1.5" regex = "1.5"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
sha2 = "0.10" sha2 = "0.10"
similar = "1.3" similar = "1.3"
smol = "1.2.5" smol = "1.2.5"

2
crates/project_panel/Cargo.toml
View file

@ -23,4 +23,4 @@ unicase = "2.6"
editor = { path = "../editor", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
workspace = { path = "../workspace", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }

2
crates/search/Cargo.toml
View file

@ -26,6 +26,6 @@ smallvec = { version = "1.6", features = ["union"] }
[dev-dependencies] [dev-dependencies]
editor = { path = "../editor", features = ["test-support"] } editor = { path = "../editor", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] } gpui = { path = "../gpui", features = ["test-support"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
workspace = { path = "../workspace", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] }
unindent = "0.1" unindent = "0.1"

2
crates/settings/Cargo.toml
View file

@ -20,6 +20,6 @@ anyhow = "1.0.38"
json_comments = "0.2" json_comments = "0.2"
schemars = "0.8" schemars = "0.8"
serde = { version = "1", features = ["derive", "rc"] } serde = { version = "1", features = ["derive", "rc"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
serde_path_to_error = "0.1.4" serde_path_to_error = "0.1.4"
toml = "0.5" toml = "0.5"

2
crates/theme/Cargo.toml
View file

@ -13,6 +13,6 @@ anyhow = "1.0.38"
indexmap = "1.6.2" indexmap = "1.6.2"
parking_lot = "0.11.1" parking_lot = "0.11.1"
serde = { version = "1", features = ["derive", "rc"] } serde = { version = "1", features = ["derive", "rc"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
serde_path_to_error = "0.1.4" serde_path_to_error = "0.1.4"
toml = "0.5" toml = "0.5"

2
crates/util/Cargo.toml
View file

@ -15,6 +15,6 @@ futures = "0.3"
log = { version = "0.4.16", features = ["kv_unstable_serde"] } log = { version = "0.4.16", features = ["kv_unstable_serde"] }
rand = { version = "0.8", optional = true } rand = { version = "0.8", optional = true }
tempdir = { version = "0.3.7", optional = true } tempdir = { version = "0.3.7", optional = true }
serde_json = { version = "1.0.64", features = [ serde_json = { version = "1.0", features = [
"preserve_order", "preserve_order",
], optional = true } ], optional = true }

2
crates/workspace/Cargo.toml
View file

@ -26,7 +26,7 @@ log = { version = "0.4.16", features = ["kv_unstable_serde"] }
parking_lot = "0.11.1" parking_lot = "0.11.1"
postage = { version = "0.4.1", features = ["futures-traits"] } postage = { version = "0.4.1", features = ["futures-traits"] }
serde = { version = "1", features = ["derive", "rc"] } serde = { version = "1", features = ["derive", "rc"] }
serde_json = { version = "1", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
smallvec = { version = "1.6", features = ["union"] } smallvec = { version = "1.6", features = ["union"] }
[dev-dependencies] [dev-dependencies]

4
crates/zed/Cargo.toml
View file

@ -76,7 +76,7 @@ regex = "1.5"
rsa = "0.4" rsa = "0.4"
rust-embed = { version = "6.3", features = ["include-exclude"] } rust-embed = { version = "6.3", features = ["include-exclude"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
serde_path_to_error = "0.1.4" serde_path_to_error = "0.1.4"
simplelog = "0.9" simplelog = "0.9"
smallvec = { version = "1.6", features = ["union"] } smallvec = { version = "1.6", features = ["union"] }
@ -107,7 +107,7 @@ settings = { path = "../settings", features = ["test-support"] }
util = { path = "../util", features = ["test-support"] } util = { path = "../util", features = ["test-support"] }
workspace = { path = "../workspace", features = ["test-support"] } workspace = { path = "../workspace", features = ["test-support"] }
env_logger = "0.8" env_logger = "0.8"
serde_json = { version = "1.0.64", features = ["preserve_order"] } serde_json = { version = "1.0", features = ["preserve_order"] }
unindent = "0.1.7" unindent = "0.1.7"
[package.metadata.bundle] [package.metadata.bundle]