Remove valuable stuff as tracing-subscriber does not support it

Author: randomairborne

.cargo/config.toml

@@ -11,7 +11,6 @@ tower-http = { version = "0.5", default-features = false, features = ["tracing",
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "signal"] }
 tracing-subscriber = { version = "0.3", features = ["json"] }
 askama = { version = "0.12", features = ["with-axum"] }
-valuable = { version = "0.1", features = ["derive"] }
 bustdir = { version = "0.1", features = ["askama"] }
 serde = { version = "1", features = ["derive"] }
 pyng = { path = "pyng" }

Cargo.lock

@@ -32,7 +32,6 @@ use serde::{Deserialize, Serialize};
 use tokio::net::TcpListener;
 use tower::ServiceBuilder;
 use tower_http::services::ServeDir;
-use valuable::Valuable;
 
 use crate::{
     executor::{ping_bedrock, ping_java},
@@ -71,7 +70,7 @@ async fn main() {
     let current_mcstatus: Arc<RwLock<ServicesResponse>> =
         Arc::new(RwLock::new(get_mcstatus(http_client.clone()).await));
     info!(
-        status = current_mcstatus.read().as_value(),
+        status = ?current_mcstatus.read(),
         "Got mojang service status"
     );
     tokio::spawn(refresh_mcstatus(http_client, Arc::clone(&current_mcstatus)));

Cargo.toml

@@ -4,7 +4,6 @@ use axum::extract::State;
 use parking_lot::RwLock;
 use reqwest::Client;
 use tokio::{join, select};
-use valuable::Valuable;
 
 use crate::{
     structures::{
@@ -179,7 +178,7 @@ async fn get_minecraft(client: Client) -> Status {
     if data.as_slice() == expected {
         Status::Operational
     } else {
-        warn!(expected = ?expected, data = data.as_value(), "Got non-matching Minecraft API data");
+        warn!(expected = ?expected, ?data, "Got non-matching Minecraft API data");
         Status::PossibleProblems
     }
 }

src/main.rs

@@ -1,9 +1,8 @@
 use std::fmt::{Debug, Display};
 
 use serde::{Deserialize, Serialize, Serializer};
-use valuable::Valuable;
 
-#[derive(Serialize, Valuable, Debug, Clone, Copy)]
+#[derive(Serialize, Debug, Clone, Copy)]
 pub struct ServicesResponse {
     #[serde(rename(serialize = "Xbox services"))]
     pub xbox: Status,
@@ -15,28 +14,28 @@ pub struct ServicesResponse {
     pub minecraft_api: Status,
 }
 
-#[derive(Deserialize, Valuable, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 #[serde(rename_all = "PascalCase")]
 pub struct XblStatusResponse {
     pub status: XblStatusStatus,
     pub core_services: Vec<XblStatusCoreService>,
     pub titles: Vec<XblStatusCoreService>,
 }
 
-#[derive(Deserialize, Valuable, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 #[serde(rename_all = "PascalCase")]
 pub struct XblStatusStatus {
     pub overall: XblStatusStatusItem,
 }
 
-#[derive(Deserialize, Valuable, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 #[serde(rename_all = "PascalCase")]
 pub struct XblStatusStatusItem {
     pub state: String,
 }
 
 #[allow(clippy::module_name_repetitions)]
-#[derive(Deserialize, Valuable, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 pub struct XblStatusCoreService {
     #[serde(rename(deserialize = "Id"))]
     pub id: i64,
@@ -46,37 +45,37 @@ pub struct XblStatusCoreService {
     pub possible_scenarios: Vec<XblStatusCoreServiceScenario>,
 }
 
-#[derive(Deserialize, Valuable, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 #[serde(rename_all = "PascalCase")]
 pub struct XblStatusCoreServiceScenario {
     pub id: i64,
 }
 
-#[derive(Deserialize, Valuable, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 #[serde(rename_all = "PascalCase")]
 pub struct XblStatusCoreServiceStatus {
     pub id: i64,
 }
 
-#[derive(Deserialize, Valuable, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 pub struct MojangSessionServerStatus {
     pub id: String,
     pub name: String,
 }
 
-#[derive(Deserialize, Valuable, Clone, Debug)]
+#[derive(Deserialize, Clone, Debug)]
 pub struct MojangApiStatus {
     pub id: String,
     pub name: String,
 }
 
-#[derive(Deserialize, Valuable, Clone, Debug, Eq, PartialEq)]
+#[derive(Deserialize, Clone, Debug, Eq, PartialEq)]
 pub struct MinecraftApiStatusEntry {
     pub id: String,
     pub name: String,
 }
 
-#[derive(Serialize, Deserialize, Valuable, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct MCPingResponse {
     pub latency: u64,
     pub players: Players,
@@ -87,32 +86,32 @@ pub struct MCPingResponse {
     pub chat: ChatStatus,
 }
 
-#[derive(Serialize, Deserialize, Valuable, Debug, Clone, Copy, Default)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, Default)]
 pub struct ChatStatus {
     pub preview: bool,
     pub signing: bool,
 }
 
-#[derive(Serialize, Deserialize, Valuable, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Version {
     pub protocol: i64,
     pub broadcast: String,
 }
 
-#[derive(Serialize, Deserialize, Valuable, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Players {
     pub online: i64,
     pub maximum: i64,
     pub sample: Vec<PlayerSample>,
 }
 
-#[derive(Serialize, Deserialize, Valuable, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct PlayerSample {
     pub uuid: String,
     pub name: String,
 }
 
-#[derive(Clone, Copy, Debug, Valuable)]
+#[derive(Clone, Copy, Debug)]
 pub enum Status {
     Operational,
     PossibleProblems,