Browse Source

Ran cargo fix --edition and updated to use the rust 2018 parser

develop
Drew Short 6 years ago
parent
commit
3745d56e5a
  1. 1
      Cargo.toml
  2. 8
      src/args/mod.rs
  3. 2
      src/args/parse.rs
  4. 2
      src/config/default.rs
  5. 4
      src/config/load.rs
  6. 2
      src/server/api.rs
  7. 2
      src/server/mod.rs
  8. 2
      src/server/router.rs

1
Cargo.toml

@ -2,6 +2,7 @@
name = "rsddns"
version = "0.1.0"
authors = ["Drew Short <warrick@sothr.com>"]
edition = "2018"
[profile.release]
panic = "abort"

8
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;

2
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<String>, default_value: &str) -> String {
String::from(match arg_value {

2
src/config/default.rs

@ -1,4 +1,4 @@
use config::model::*;
use crate::config::model::*;
fn get_default_config() -> Config {
Config {

4
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<Config, ConfigError> {
match serde_yaml::from_str(yaml_str) {

2
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))

2
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;

2
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()

Loading…
Cancel
Save