diff --git a/Cargo.toml b/Cargo.toml index 98af057..45cc2d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ name = "rsddns" version = "0.1.0" authors = ["Drew Short "] +edition = "2018" [profile.release] panic = "abort" diff --git a/src/args/mod.rs b/src/args/mod.rs index b281c6c..afcf0ee 100644 --- a/src/args/mod.rs +++ b/src/args/mod.rs @@ -1,9 +1,9 @@ use clap::{App, Arg}; -use VERSION; -use DEFAULT_HOST; -use DEFAULT_PORT_STR; -use DEFAULT_WORKERS_STR; +use crate::VERSION; +use crate::DEFAULT_HOST; +use crate::DEFAULT_PORT_STR; +use crate::DEFAULT_WORKERS_STR; pub mod parse; diff --git a/src/args/parse.rs b/src/args/parse.rs index 24ad17e..27b87ca 100644 --- a/src/args/parse.rs +++ b/src/args/parse.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use clap::ArgMatches; -use config::model::Config; +use crate::config::model::Config; fn get_config_for_string(arg_value: Option<&str>, config_value: &Option, default_value: &str) -> String { String::from(match arg_value { diff --git a/src/config/default.rs b/src/config/default.rs index eddf43a..024c437 100644 --- a/src/config/default.rs +++ b/src/config/default.rs @@ -1,4 +1,4 @@ -use config::model::*; +use crate::config::model::*; fn get_default_config() -> Config { Config { diff --git a/src/config/load.rs b/src/config/load.rs index d508435..d13bc58 100644 --- a/src/config/load.rs +++ b/src/config/load.rs @@ -3,8 +3,8 @@ use std::io::prelude::*; use serde_yaml; -use config::error::ConfigError; -use config::model::Config; +use crate::config::error::ConfigError; +use crate::config::model::Config; fn read_config(yaml_str: &str) -> Result { match serde_yaml::from_str(yaml_str) { diff --git a/src/server/api.rs b/src/server/api.rs index b8e3697..a3c2197 100644 --- a/src/server/api.rs +++ b/src/server/api.rs @@ -8,7 +8,7 @@ use actix_web::http::StatusCode; use bytes::{Buf, Bytes, IntoBuf}; use futures::future::Future; -use server::error::APIError; +use crate::server::error::APIError; pub fn route(scope: Scope<()>) -> Scope<()> { scope.resource("address", |r| r.method(Method::GET).f(get_address)) diff --git a/src/server/mod.rs b/src/server/mod.rs index a369eef..cac1605 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -1,6 +1,6 @@ use actix_web::{HttpRequest, Json, Result}; -use VERSION; +use crate::VERSION; pub mod api; pub mod error; diff --git a/src/server/router.rs b/src/server/router.rs index 88ac497..905e163 100644 --- a/src/server/router.rs +++ b/src/server/router.rs @@ -3,7 +3,7 @@ extern crate actix_web; use actix_web::{App, http}; use actix_web::middleware::Logger; -use server; +use crate::server; pub fn create() -> App { actix_web::App::new()