actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-02-17 14:43:31 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:actix/actix-net

Browse Source
This commit is contained in:
Nikolay Kim 2019-03-14 10:28:47 -07:00
commit ad007b8b42
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actix-rt/src/runtime.rs
View File

@ -41,7 +41,7 @@ impl Error for RunError {
self.inner.description()
}
fn cause(&self) -> Option<&Error> {
self.inner.cause()
self.inner.source()
}
}

4
actix-rt/src/system.rs
View File

@ -1,13 +1,13 @@
use std::cell::RefCell;
use std::io;
use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
use std::sync::atomic::{AtomicUsize, Ordering};
use futures::sync::mpsc::UnboundedSender;
use crate::arbiter::{Arbiter, SystemCommand};
use crate::builder::{Builder, SystemRunner};
static SYSTEM_COUNT: AtomicUsize = ATOMIC_USIZE_INIT;
static SYSTEM_COUNT: AtomicUsize = AtomicUsize::new(0);
/// System is a runtime manager.
#[derive(Clone, Debug)]