pjenvey

diff --git a/channelserver/src/server.rs b/channelserver/src/server.rs
index 5de9069..bf2581a 100644
--- a/channelserver/src/server.rs
+++ b/channelserver/src/server.rs
@@ -278,7 +278,8 @@ impl Handler<Connect> for ChannelServer {
         );
         let chan_id = &msg.channel.to_simple();
         // Is this a new channel request?
-        if !self.channels.contains_key(&msg.channel) {
+        use std::collections::hash_map::Entry; // XXX:

pjenvey

$ rustc --version
rustc 1.30.0 (da5f414c2 2018-10-24)
$ grep recursion_limit src/main.rs 
#![recursion_limit="4096"]
$ cargo doc -q --document-private-items --no-deps  > /dev/stdout 2>&1 | tee /tmp/out
error[E0275]: overflow evaluating the requirement `<&_ as diesel::Insertable<_>>::Values`
  |
  = help: consider adding a `#![recursion_limit="8192"]` attribute to your crate
  = note: required because of the requirements on the impl of `diesel::Insertable<_>` for `(&_, &_, &_)`
  = note: required because of the requirements on the impl of `diesel::Insertable<_>` for `&(_, _, _)`

pjenvey

use failure::{Context, Fail};
use rusqlite;

pub type Result<T> = std::result::Result<T, Error>;

#[derive(Debug)]
pub struct Error {
    inner: Context<ErrorKind>,
}

pjenvey

$ cargo build -vvv -p libsqlite3-sys
       Fresh pkg-config v0.3.14
   Compiling libsqlite3-sys v0.11.1
     Running `rustc --edition=2018 --crate-name build_script_build /home/pjenvey/.cargo/registry/src/github.com-1ecc6299db9ec823/libsqlite3-sys-0.11.1/build.rs --color always --crate-type bin --emit=dep-info,link -C debuginfo=2 --cfg 'feature="default"' --cfg 'feature="min_sqlite_version_3_6_8"' --cfg 'feature="min_sqlite_version_3_7_7"' --cfg 'feature="pkg-config"' --cfg 'feature="sqlcipher"' --cfg 'feature="vcpkg"' -C metadata=10fc3d68df14e06a -C extra-filename=-10fc3d68df14e06a --out-dir /media/ext/pjenvey/src/moz/application-services/target/debug/build/libsqlite3-sys-10fc3d68df14e06a -L dependency=/media/ext/pjenvey/src/moz/application-services/target/debug/deps --extern pkg_config=/media/ext/pjenvey/src/moz/application-services/target/debug/deps/libpkg_config-a3f65465477e5815.rlib --cap-lints warn`
     Running `/media/ext/pjenvey/src/moz/application-services/target/debug/build/libsqlite3-sys-10fc3d68

pjenvey

diff --git a/autopush-common/src/redis.rs b/autopush-common/src/redis_util.rs
similarity index 52%
rename from autopush-common/src/redis.rs
rename to autopush-common/src/redis_util.rs
index 800a37d1..4add622d 100644
--- a/autopush-common/src/redis.rs
+++ b/autopush-common/src/redis_util.rs
@@ -1,11 +1,11 @@
-use redis::{cmd, pipe};
-use redis::{ConnectionLike, Pipeline, RedisResult, ToRedisArgs};