Created
December 30, 2019 18:30
-
-
Save bowrocker/a20f8fe2987f2475f91faaaa9669ba1a to your computer and use it in GitHub Desktop.
cueball diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Cargo.toml b/Cargo.toml | |
| index ef85636..fa66e0d 100644 | |
| --- a/Cargo.toml | |
| +++ b/Cargo.toml | |
| @@ -1,6 +1,6 @@ | |
| [package] | |
| name = "cueball" | |
| -version = "0.3.0" | |
| +version = "0.2.0" | |
| authors = [ | |
| "Kelly McLaughlin <kelly.mclaughlin@joyent.com>", | |
| "Jon Anderson <jon.anderson@joyent.com>", | |
| diff --git a/src/connection_pool.rs b/src/connection_pool.rs | |
| index b9234ff..01387b9 100644 | |
| --- a/src/connection_pool.rs | |
| +++ b/src/connection_pool.rs | |
| @@ -55,9 +55,9 @@ pub struct ConnectionPool<C, R, F> { | |
| log: Logger, | |
| state: ConnectionPoolState, | |
| decoherence_timer: Option<timer::Timer>, | |
| - decoherence_timer_guard: Guard, | |
| + _decoherence_timer_guard: Option<Guard>, | |
| connection_check_timer: Option<timer::Timer>, | |
| - connection_check_timer_guard: Guard, | |
| + _connection_check_timer_guard: Option<Guard>, | |
| _resolver: PhantomData<R>, | |
| _connection_function: PhantomData<F>, | |
| } | |
| @@ -135,11 +135,9 @@ where | |
| log: self.log.clone(), | |
| state: self.state, | |
| decoherence_timer: None, | |
| - decoherence_timer_guard: self.decoherence_timer_guard.clone(), | |
| connection_check_timer: None, | |
| - connection_check_timer_guard: self | |
| - .connection_check_timer_guard | |
| - .clone(), | |
| + _connection_check_timer_guard: None, | |
| + _decoherence_timer_guard: None, | |
| _resolver: PhantomData, | |
| _connection_function: PhantomData, | |
| } | |
| @@ -266,9 +264,9 @@ where | |
| log: logger, | |
| state: ConnectionPoolState::Running, | |
| decoherence_timer: Some(decoherence_timer), | |
| - decoherence_timer_guard, | |
| + _decoherence_timer_guard: Some(decoherence_timer_guard), | |
| connection_check_timer: Some(connection_check_timer), | |
| - connection_check_timer_guard, | |
| + _connection_check_timer_guard: Some(connection_check_timer_guard), | |
| _resolver: PhantomData, | |
| _connection_function: PhantomData, | |
| }; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment