Skip to content

Replace crossbeam-channel by flume #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Replace crossbeam-channel by flume #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7853c5d
Fix warnings
Dec 31, 2020
5d66a44
Replace crossbeam-channel by flume
Dec 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ path = "lib.rs"
slog = "2.1"
thread_local = "1"
take_mut = "0.2.0"
crossbeam-channel = "0.5"
flume = "0.10.1"

[package.metadata.docs.rs]
features = ["nested-values", "dynamic-keys"]
21 changes: 10 additions & 11 deletions lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,16 @@

#[macro_use]
extern crate slog;
extern crate crossbeam_channel;
extern crate flume;
extern crate take_mut;
extern crate thread_local;

use crossbeam_channel::Sender;
use flume::Sender;

use slog::{BorrowedKV, Level, Record, RecordStatic, SingleKV, KV};
use slog::{Key, OwnedKVList, Serializer};

use slog::Drain;
use std::error::Error;
use std::fmt;
use std::sync;
use std::{io, thread};
Expand Down Expand Up @@ -191,14 +190,14 @@ pub enum AsyncError {
Fatal(Box<dyn std::error::Error>),
}

impl<T> From<crossbeam_channel::TrySendError<T>> for AsyncError {
fn from(_: crossbeam_channel::TrySendError<T>) -> AsyncError {
impl<T> From<flume::TrySendError<T>> for AsyncError {
fn from(_: flume::TrySendError<T>) -> AsyncError {
AsyncError::Full
}
}

impl<T> From<crossbeam_channel::SendError<T>> for AsyncError {
fn from(_: crossbeam_channel::SendError<T>) -> AsyncError {
impl<T> From<flume::SendError<T>> for AsyncError {
fn from(_: flume::SendError<T>) -> AsyncError {
AsyncError::Fatal(Box::new(io::Error::new(
io::ErrorKind::BrokenPipe,
"The logger thread terminated",
Expand All @@ -210,7 +209,7 @@ impl<T> From<std::sync::PoisonError<T>> for AsyncError {
fn from(err: std::sync::PoisonError<T>) -> AsyncError {
AsyncError::Fatal(Box::new(io::Error::new(
io::ErrorKind::BrokenPipe,
err.description(),
err.to_string(),
)))
}
}
Expand Down Expand Up @@ -275,7 +274,7 @@ where
}

fn spawn_thread(self) -> (thread::JoinHandle<()>, Sender<AsyncMsg>) {
let (tx, rx) = crossbeam_channel::bounded(self.chan_size);
let (tx, rx) = flume::bounded(self.chan_size);
let mut builder = thread::Builder::new();
if let Some(thread_name) = self.thread_name {
builder = builder.name(thread_name);
Expand Down Expand Up @@ -415,9 +414,9 @@ impl AsyncCore {
fn get_sender(
&self,
) -> Result<
&crossbeam_channel::Sender<AsyncMsg>,
&flume::Sender<AsyncMsg>,
std::sync::PoisonError<
sync::MutexGuard<crossbeam_channel::Sender<AsyncMsg>>,
sync::MutexGuard<flume::Sender<AsyncMsg>>,
>,
> {
self.tl_sender.get_or_try(|| Ok(self.ref_sender.clone()))
Expand Down