Merge branch 'development'
ci/woodpecker/push/ociImagePush Pipeline was successful Details

This commit is contained in:
Natty 2023-10-24 00:30:44 +02:00
commit 146c072c92
Signed by: natty
GPG Key ID: BF6CB659ADEE60EC
5 changed files with 2099 additions and 5 deletions

69
Cargo.lock generated
View File

@ -411,6 +411,12 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "bytecount"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
[[package]]
name = "byteorder"
version = "1.4.3"
@ -456,6 +462,15 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663"
[[package]]
name = "castaway"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
dependencies = [
"rustversion",
]
[[package]]
name = "cc"
version = "1.0.81"
@ -578,6 +593,19 @@ dependencies = [
"tokio-util",
]
[[package]]
name = "compact_str"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
dependencies = [
"castaway",
"cfg-if",
"itoa",
"ryu",
"static_assertions",
]
[[package]]
name = "const-oid"
version = "0.9.4"
@ -742,6 +770,15 @@ dependencies = [
"serde",
]
[[package]]
name = "emojis"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee61eb945bff65ee7d19d157d39c67c33290ff0742907413fd5eefd29edc979"
dependencies = [
"phf",
]
[[package]]
name = "equivalent"
version = "1.0.1"
@ -1603,6 +1640,19 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "mmm_parser"
version = "0.2.1-alpha"
dependencies = [
"compact_str",
"either",
"emojis",
"nom",
"nom_locate",
"tracing",
"unicode-segmentation",
]
[[package]]
name = "nom"
version = "7.1.3"
@ -1613,6 +1663,17 @@ dependencies = [
"minimal-lexical",
]
[[package]]
name = "nom_locate"
version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3"
dependencies = [
"bytecount",
"memchr",
"nom",
]
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
@ -2474,18 +2535,18 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
[[package]]
name = "serde"
version = "1.0.180"
version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.180"
version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",

View File

@ -14,6 +14,7 @@ members = [
"fe_calckey",
"magnetar_common",
"magnetar_sdk",
"magnetar_mmm_parser",
"core"
]
@ -27,7 +28,10 @@ axum = "0.6"
cached = "0.46"
cfg-if = "1"
chrono = "0.4"
compact_str = "0.7"
dotenvy = "0.15"
either = "1.9"
emojis = "0.6"
futures-core = "0.3"
futures-util = "0.3"
headers = "0.3"
@ -36,8 +40,11 @@ hyper = "0.14"
js-sys = "0.3"
log = "0.4"
miette = "5.9"
nom = "7"
nom_locate = "4"
percent-encoding = "2.2"
redis = "0.23"
regex = "1.9"
reqwest = "0.11"
sea-orm = "0.12"
sea-orm-migration = "0.12"

View File

@ -0,0 +1,14 @@
[package]
name = "mmm_parser"
version.workspace = true
edition.workspace = true
license = "MIT OR Apache-2.0"
[dependencies]
either = { workspace = true }
emojis = { workspace = true }
nom = { workspace = true }
nom_locate = { workspace = true }
compact_str = { workspace = true }
tracing = { workspace = true }
unicode-segmentation = { workspace = true }

View File

@ -0,0 +1,5 @@
# MMM
Magnetar {marinated, modified} Markdown?
#TODO: Finish docs

File diff suppressed because it is too large Load Diff