Merge pull request #47 from kpcyrd/2018

Port to rust 2018 edition

Cargo.toml

@@ -7,6 +7,7 @@ license = "GPL-3.0"
 repository = "https://github.com/kpcyrd/sn0int"
 categories = ["command-line-utilities"]
 readme = "README.md"
+edition = "2018"
 
 [badges]
 travis-ci = { repository = "kpcyrd/sn0int" }

sn0int-registry/Cargo.toml

@@ -5,6 +5,7 @@ description = "sn0int registry"
 authors = ["kpcyrd <git@rxv.cc>"]
 license = "GPL-3.0"
 repository = "https://github.com/kpcyrd/sn0int"
+edition = "2018"
 
 [dependencies]
 sn0int-common = { version="0.3.0", path="sn0int-common" }

sn0int-registry/sn0int-common/Cargo.toml

@@ -5,6 +5,7 @@ description = "Common code for sn0int"
 authors = ["kpcyrd <git@rxv.cc>"]
 license = "GPL-3.0"
 repository = "https://github.com/kpcyrd/sn0int"
+edition = "2018"
 
 [dependencies]
 serde = "1.0"

sn0int-registry/sn0int-common/src/api.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 
 
 #[derive(Debug, Serialize, Deserialize)]

sn0int-registry/sn0int-common/src/id.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use nom;
 use nom::types::CompleteStr;
 use std::fmt;

sn0int-registry/sn0int-common/src/lib.rs

@@ -4,10 +4,10 @@
 
 pub mod api;
 pub mod errors;
-pub use errors::*;
+pub use crate::errors::*;
 pub mod metadata;
 pub mod id;
-pub use id::*;
+pub use crate::id::*;
 
 #[cfg(test)]
 mod tests {

sn0int-registry/sn0int-common/src/metadata.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 
 use std::str::FromStr;
 

sn0int-registry/src/auth.rs

@@ -1,10 +1,10 @@
-use errors::*;
+use crate::errors::*;
 use diesel::pg::PgConnection;
 use oauth2::basic::BasicClient;
 use oauth2::prelude::*;
 use oauth2::{AuthUrl, AuthorizationCode, ClientId, ClientSecret, CsrfToken, RedirectUrl, TokenUrl};
-use github::GithubAuthenticator;
-use models::AuthToken;
+use crate::github::GithubAuthenticator;
+use crate::models::AuthToken;
 use url::Url;
 use std::env;
 

sn0int-registry/src/auth2.rs

@@ -1,10 +1,10 @@
-use errors::*;
-use models::AuthToken;
-use db::Connection;
+use crate::errors::*;
+use crate::models::AuthToken;
+use crate::db::Connection;
 use rocket::http::Status;
 use rocket::{Request, Outcome};
 use rocket::request::{self, FromRequest};
-use github::GithubAuthenticator;
+use crate::github::GithubAuthenticator;
 
 
 pub struct AuthHeader(String);

sn0int-registry/src/db.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use std::io;
 use std::thread;
 use std::time::Duration;

sn0int-registry/src/github.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use std::env;
 use reqwest;
 

sn0int-registry/src/main.rs

@@ -4,30 +4,20 @@
 #![feature(custom_derive)]
 #![plugin(rocket_codegen)]
 
-extern crate sn0int_common;
-extern crate rocket;
 #[macro_use] extern crate rocket_contrib;
-extern crate dotenv;
-extern crate blake2;
-extern crate serde_json;
 #[macro_use] extern crate serde_derive;
 #[macro_use] extern crate log;
 #[macro_use] extern crate maplit;
 #[macro_use] extern crate lazy_static;
 #[macro_use] extern crate failure;
 #[macro_use] extern crate diesel;
 #[macro_use] extern crate diesel_migrations;
-extern crate diesel_full_text_search;
-extern crate oauth2;
-extern crate url;
-extern crate reqwest;
-extern crate semver;
 
 use rocket_contrib::{Json, Value, Template};
 use dotenv::dotenv;
 
 use std::env;
-use errors::*;
+use crate::errors::*;
 
 pub mod assets;
 pub mod auth;

sn0int-registry/src/models.rs

@@ -1,9 +1,9 @@
-use errors::*;
+use crate::errors::*;
 use diesel::prelude::*;
 use diesel::pg::PgConnection;
 use diesel::sql_types::BigInt;
 use diesel_full_text_search::{plainto_tsquery, TsQueryExtensions};
-use schema::*;
+use crate::schema::*;
 
 
 #[derive(AsChangeset, Serialize, Deserialize, Queryable, Insertable)]

sn0int-registry/src/routes/api.rs

@@ -1,13 +1,13 @@
-use errors::*;
-use auth2::AuthHeader;
-use db;
+use crate::errors::*;
+use crate::auth2::AuthHeader;
+use crate::db;
 use diesel::Connection;
 use semver::Version;
 use sn0int_common::api::*;
 use sn0int_common::id;
 use sn0int_common::metadata::Metadata;
 use rocket_contrib::Json;
-use models::*;
+use crate::models::*;
 
 
 #[get("/quickstart")]

sn0int-registry/src/routes/assets.rs

@@ -1,7 +1,7 @@
 use rocket::http::Status;
 use rocket::response::content;
 use rocket_contrib::Template;
-use assets::{ASSET_REV, FAVICON, STYLE_SHEET};
+use crate::assets::{ASSET_REV, FAVICON, STYLE_SHEET};
 
 
 #[get("/")]

sn0int-registry/src/routes/auth.rs

@@ -1,10 +1,10 @@
-use errors::*;
-use auth::Authenticator;
-use db;
+use crate::errors::*;
+use crate::auth::Authenticator;
+use crate::db;
 use rocket::request::Form;
 use rocket::response::Redirect;
 use rocket_contrib::Template;
-use assets::ASSET_REV;
+use crate::assets::ASSET_REV;
 use serde_json::{self, Value};
 
 

src/api.rs

@@ -1,6 +1,6 @@
-use errors::*;
+use crate::errors::*;
 use std::fmt;
-use config::Config;
+use crate::config::Config;
 use chrootable_https::{self, HttpClient, Body, Request, Uri};
 use chrootable_https::http::request::Builder as RequestBuilder;
 use chrootable_https::header::CONTENT_TYPE;
@@ -11,7 +11,7 @@ use serde::ser::Serialize;
 use serde_json;
 use sn0int_common::api::*;
 use sn0int_common::ModuleID;
-use web;
+use crate::web;
 
 
 pub struct Client {

src/archive.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use tar;
 use libflate::gzip;
 use std::io;

src/args.rs

@@ -1,6 +1,6 @@
 use structopt::clap::{AppSettings, Shell};
 use sn0int_common::ModuleID;
-use workspaces::Workspace;
+use crate::workspaces::Workspace;
 
 
 #[derive(Debug, StructOpt)]

src/auth.rs

@@ -1,12 +1,12 @@
-use errors::*;
+use crate::errors::*;
 use opener;
 use std::fs;
 use std::thread;
 use std::time::Duration;
-use api::Client;
-use config::Config;
-use paths;
-use term;
+use crate::api::Client;
+use crate::config::Config;
+use crate::paths;
+use crate::term;
 
 
 pub fn load_token() -> Result<String> {

src/cmd/add_cmd.rs

@@ -1,9 +1,9 @@
-use errors::*;
+use crate::errors::*;
 
-use models::*;
-use shell::Readline;
+use crate::models::*;
+use crate::shell::Readline;
 use structopt::StructOpt;
-use utils;
+use crate::utils;
 
 
 #[derive(Debug, StructOpt)]

src/cmd/delete_cmd.rs

@@ -1,10 +1,10 @@
-use errors::*;
+use crate::errors::*;
 
-use db;
-use shell::Readline;
+use crate::db;
+use crate::shell::Readline;
 use structopt::StructOpt;
-use models::*;
-use term;
+use crate::models::*;
+use crate::term;
 
 
 #[derive(Debug, StructOpt)]

src/cmd/mod_cmd.rs

@@ -1,16 +1,16 @@
-use errors::*;
+use crate::errors::*;
 
-use args;
-use args::Install;
-use api::Client;
-use config::Config;
+use crate::args;
+use crate::args::Install;
+use crate::api::Client;
+use crate::config::Config;
 use colored::Colorize;
-use engine::Module;
-use registry;
-use shell::Readline;
+use crate::engine::Module;
+use crate::registry;
+use crate::shell::Readline;
 use structopt::StructOpt;
-use term;
-use worker;
+use crate::term;
+use crate::worker;
 
 
 #[derive(Debug, StructOpt)]

src/cmd/noscope_cmd.rs

@@ -1,10 +1,10 @@
-use errors::*;
+use crate::errors::*;
 
-use db;
-use shell::Readline;
+use crate::db;
+use crate::shell::Readline;
 use structopt::StructOpt;
-use models::*;
-use term;
+use crate::models::*;
+use crate::term;
 
 
 #[derive(Debug, StructOpt)]

src/cmd/quickstart_cmd.rs

@@ -1,11 +1,11 @@
-use errors::*;
+use crate::errors::*;
 
-use args::Install;
-use api::Client;
+use crate::args::Install;
+use crate::api::Client;
 // use colored::Colorize;
-use cmd::mod_cmd;
-use registry;
-use shell::Readline;
+use crate::cmd::mod_cmd;
+use crate::registry;
+use crate::shell::Readline;
 use structopt::StructOpt;
 use sn0int_common::ModuleID;
 

src/cmd/run_cmd.rs

@@ -1,14 +1,14 @@
-use errors::*;
+use crate::errors::*;
 
-use db::{Database, Filter};
+use crate::db::{Database, Filter};
 use sn0int_common::metadata::Source;
 use serde::Serialize;
 use serde_json;
-use shell::Readline;
+use crate::shell::Readline;
 use structopt::StructOpt;
-use models::*;
-use term;
-use worker;
+use crate::models::*;
+use crate::term;
+use crate::worker;
 
 
 #[derive(Debug, StructOpt)]

src/cmd/scope_cmd.rs

@@ -1,10 +1,10 @@
-use errors::*;
+use crate::errors::*;
 
-use db;
-use shell::Readline;
+use crate::db;
+use crate::shell::Readline;
 use structopt::StructOpt;
-use models::*;
-use term;
+use crate::models::*;
+use crate::term;
 
 
 #[derive(Debug, StructOpt)]

src/cmd/select_cmd.rs

@@ -1,9 +1,9 @@
-use errors::*;
+use crate::errors::*;
 
-use db;
-use shell::Readline;
+use crate::db;
+use crate::shell::Readline;
 use structopt::StructOpt;
-use models::*;
+use crate::models::*;
 
 
 #[derive(Debug, StructOpt)]

src/cmd/target_cmd.rs

@@ -1,11 +1,11 @@
-use errors::*;
+use crate::errors::*;
 
-use db;
-use shell::Readline;
+use crate::db;
+use crate::shell::Readline;
 use sn0int_common::metadata::Source;
 use structopt::StructOpt;
-use term;
-use models::*;
+use crate::term;
+use crate::models::*;
 
 
 #[derive(Debug, StructOpt)]

src/cmd/use_cmd.rs

@@ -1,6 +1,6 @@
-use errors::*;
+use crate::errors::*;
 
-use shell::Readline;
+use crate::shell::Readline;
 use structopt::StructOpt;