Roll back tokio and rocket update since ruma's request is at 0.2 tokio

This commit is contained in:
Devin Ragotzy 2021-01-18 19:59:08 -05:00
parent 3a6f264450
commit a897608025
4 changed files with 54 additions and 168 deletions

View file

@ -28,11 +28,6 @@ fn setup_rocket() -> rocket::Rocket {
// Force log level off, so we can use our own logger
std::env::set_var("CONDUIT_LOG_LEVEL", "off");
std::env::set_var(
"CONDUIT_CONFIG",
"/home/devinr/aprog/rust/__forks__/conduit/conduit.toml",
);
let config =
Figment::from(rocket::Config::release_default())
.merge(