From d9d3e59cb6f94638a20e28a23399c0d67b284517 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Sun, 30 Jul 2023 13:51:18 -0700 Subject: [PATCH] update --- Cargo.lock | 81 ++++++++++++++---------------------------------------- 1 file changed, 21 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90a1e4b7..823449ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -398,14 +398,14 @@ dependencies = [ [[package]] name = "common" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "boring", "clocksource", "macros", - "metriken 0.2.1", + "metriken", "net", - "ringlog 0.1.1", + "ringlog", "serde", ] @@ -421,7 +421,7 @@ dependencies = [ [[package]] name = "config" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "common", "log", @@ -1117,11 +1117,11 @@ dependencies = [ [[package]] name = "logger" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "common", "config", - "ringlog 0.1.1", + "ringlog", ] [[package]] @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "macros" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "proc-macro2", "quote", @@ -1155,20 +1155,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" -[[package]] -name = "metriken" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7be5d59844605ce7e2e1952b34a708cbc221b459247988dcde96140508bc6f" -dependencies = [ - "clocksource", - "heatmap", - "linkme", - "metriken-derive 0.1.0", - "once_cell", - "parking_lot", -] - [[package]] name = "metriken" version = "0.2.1" @@ -1178,24 +1164,12 @@ dependencies = [ "heatmap", "histogram", "linkme", - "metriken-derive 0.2.0", + "metriken-derive", "once_cell", "parking_lot", "phf", ] -[[package]] -name = "metriken-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e58941ebb3d827378ea64a769df9cf65e47f75d78227969d70431c19578e5dc" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "metriken-derive" version = "0.2.0" @@ -1354,13 +1328,13 @@ dependencies = [ [[package]] name = "net" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "boring", "boring-sys", "foreign-types-shared", "libc", - "metriken 0.2.1", + "metriken", "mio 0.8.6", ] @@ -1682,7 +1656,7 @@ dependencies = [ [[package]] name = "protocol-common" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "bytes 1.4.0", "common", @@ -1694,11 +1668,11 @@ dependencies = [ [[package]] name = "protocol-memcache" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "common", "logger", - "metriken 0.2.1", + "metriken", "nom", "protocol-common", ] @@ -1706,12 +1680,12 @@ dependencies = [ [[package]] name = "protocol-ping" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "common", "config", "logger", - "metriken 0.2.1", + "metriken", "protocol-common", "storage-types", ] @@ -1853,19 +1827,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "ringlog" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82db4b27000bac41d738972779f440ed6176ebe82c935b736594eff989aa60f1" -dependencies = [ - "ahash", - "clocksource", - "log", - "metriken 0.1.4", - "mpmc", -] - [[package]] name = "ringlog" version = "0.2.0" @@ -1875,7 +1836,7 @@ dependencies = [ "ahash", "clocksource", "log", - "metriken 0.2.1", + "metriken", "mpmc", ] @@ -1896,7 +1857,7 @@ dependencies = [ "http-body-util", "humantime", "hyper 1.0.0-rc.3", - "metriken 0.2.1", + "metriken", "mio 0.8.6", "momento", "net", @@ -1908,7 +1869,7 @@ dependencies = [ "rand_xoshiro", "ratelimit", "redis", - "ringlog 0.2.0", + "ringlog", "serde", "serde_json", "session", @@ -2101,12 +2062,12 @@ dependencies = [ [[package]] name = "session" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" dependencies = [ "bytes 1.4.0", "common", "log", - "metriken 0.2.1", + "metriken", "net", "protocol-common", ] @@ -2212,7 +2173,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "storage-types" version = "0.3.1" -source = "git+https://github.com/brayniac/pelikan?branch=metriken#de38e75c034f115a48a57bc3a2caf0d492ae118f" +source = "git+https://github.com/brayniac/pelikan?branch=metriken#dcfb303fa8acb443ada3350bad9d61e881453fa2" [[package]] name = "strsim"