use tracing instead, revert this string converter function

This commit is contained in:
Cappy Ishihara 2024-06-02 03:37:57 +07:00
parent d4f0aa96c3
commit 6d26330bd8
No known key found for this signature in database
GPG key ID: 50862C285CB76906
3 changed files with 33 additions and 1 deletions

13
Cargo.lock generated
View file

@ -1185,6 +1185,7 @@ dependencies = [
"tokio", "tokio",
"toml", "toml",
"tower-http", "tower-http",
"tracing",
"tracing-subscriber", "tracing-subscriber",
"uuid", "uuid",
] ]
@ -1587,9 +1588,21 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [ dependencies = [
"log", "log",
"pin-project-lite", "pin-project-lite",
"tracing-attributes",
"tracing-core", "tracing-core",
] ]
[[package]]
name = "tracing-attributes"
version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "tracing-core" name = "tracing-core"
version = "0.1.32" version = "0.1.32"

View file

@ -36,6 +36,7 @@ axum = { version = "0.7.5", features = ["ws", "macros", "http2"] }
tower-http = { version = "0.5.2", features = ["trace"] } tower-http = { version = "0.5.2", features = ["trace"] }
tokio = { version = "1.37.0", features = ["full"] } tokio = { version = "1.37.0", features = ["full"] }
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "chrono"] } tracing-subscriber = { version = "0.3.18", features = ["env-filter", "chrono"] }
tracing = "0.1.40"
# TODO: Sort it! # TODO: Sort it!
# TODO: Replace Vec<u8> and &[u8] by Bytes # TODO: Replace Vec<u8> and &[u8] by Bytes

View file

@ -16,9 +16,27 @@ pub fn rand() -> [u8; 50] {
nums nums
} }
//? What is this guy doing //? What is this guy doing
#[tracing::instrument]
pub fn bytes_into_string(code: &[u8]) -> String { pub fn bytes_into_string(code: &[u8]) -> String {
// This *might* be the correct way to do it.
// code.iter().map(|byte| format!("{:02x}", byte)).collect::<String>() // ????? Why do you need this? Why not just String::from_utf8()?? // code.iter().map(|byte| format!("{:02x}", byte)).collect::<String>() // ????? Why do you need this? Why not just String::from_utf8()??
String::from_utf8_lossy(code).to_string() // So we need to turn each byte into a string with a 2-digit hexadecimal representation apparently...
// hex::encode_to_slice(input, output)
let res = code.iter().fold(String::new(), |mut acc, byte| {
acc.push_str(&format!("{:02x}", byte));
acc
}); // This is the same as the above, but with a fold instead of a map
// Can we do this with hex::encode instead?
res
// String::from_utf8_lossy(code).to_string() // Tried this, causes corrupted string
} }
// Конец кор функций // Конец кор функций