Skip to content

Commit

Permalink
update rustcommon (#479)
Browse files Browse the repository at this point in the history
Updates rustcommon to the latest version and makes the necessary
changes to import the time types where needed.
  • Loading branch information
brayniac authored Oct 20, 2022
1 parent 84089a0 commit cd08eb5
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ quote = "1.0.21"
rand = "0.8.5"
rand_chacha = "0.3.1"
rand_xoshiro = "0.6.0"
rustcommon-logger = { git = "https://github.com/twitter/rustcommon", rev = "87e0c87" }
rustcommon-metrics = { git = "https://github.com/twitter/rustcommon", rev = "87e0c87" }
rustcommon-time = { git = "https://github.com/twitter/rustcommon", rev = "87e0c87" }
rustcommon-logger = { git = "https://github.com/twitter/rustcommon", rev = "d550e01" }
rustcommon-metrics = { git = "https://github.com/twitter/rustcommon", rev = "d550e01" }
rustcommon-time = { git = "https://github.com/twitter/rustcommon", rev = "d550e01" }
serde = "1.0.145"
serde_json = "1.0.85"
slab = "0.4.7"
Expand Down
2 changes: 1 addition & 1 deletion src/core/proxy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use std::io::{Error, ErrorKind, Result};
use std::sync::Arc;
use waker::Waker;

type Instant = rustcommon_metrics::Instant<rustcommon_metrics::Nanoseconds<u64>>;
type Instant = rustcommon_metrics::time::Instant<rustcommon_metrics::time::Nanoseconds<u64>>;

mod backend;
mod frontend;
Expand Down
2 changes: 1 addition & 1 deletion src/core/server/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ use workers::WorkersBuilder;

pub use process::{Process, ProcessBuilder};

type Instant = rustcommon_metrics::Instant<rustcommon_metrics::Nanoseconds<u64>>;
type Instant = rustcommon_metrics::time::Instant<rustcommon_metrics::time::Nanoseconds<u64>>;

// TODO(bmartin): this *should* be plenty safe, the queue should rarely ever be
// full, and a single wakeup should drain at least one message and make room for
Expand Down
1 change: 1 addition & 0 deletions src/protocol/memcache/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub use protocol_common::*;

use common::expiry::TimeType;
use logger::Klog;
use rustcommon_metrics::time::*;
use rustcommon_metrics::*;

const CRLF: &[u8] = b"\r\n";
Expand Down

0 comments on commit cd08eb5

Please sign in to comment.