From eb6fb8e5fe1efb3fbb927d13075cf5a1b33aa83e Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Tue, 8 Jan 2019 21:43:14 -0800
Subject: rust 2018 edition!

Only the basics to get things to compile/test again in this commit.
---
 rust/src/api_entity_crud.rs | 10 +++++-----
 rust/src/api_helpers.rs     |  8 ++++----
 rust/src/api_server.rs      | 14 +++++++-------
 rust/src/api_wrappers.rs    | 12 ++++++------
 rust/src/auth.rs            |  8 ++++----
 rust/src/database_models.rs |  6 +++---
 rust/src/lib.rs             |  4 ++--
 7 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'rust/src')

diff --git a/rust/src/api_entity_crud.rs b/rust/src/api_entity_crud.rs
index 76fa9bba..44b421f9 100644
--- a/rust/src/api_entity_crud.rs
+++ b/rust/src/api_entity_crud.rs
@@ -1,11 +1,11 @@
-use api_helpers::*;
-use api_server::get_release_files;
+use crate::api_helpers::*;
+use crate::api_server::get_release_files;
 use chrono;
-use database_models::*;
-use database_schema::*;
+use crate::database_models::*;
+use crate::database_schema::*;
 use diesel::prelude::*;
 use diesel::{self, insert_into};
-use errors::*;
+use crate::errors::*;
 use fatcat_api_spec::models::*;
 use sha1::Sha1;
 use std::marker::Sized;
diff --git a/rust/src/api_helpers.rs b/rust/src/api_helpers.rs
index 5ee529b9..55085403 100644
--- a/rust/src/api_helpers.rs
+++ b/rust/src/api_helpers.rs
@@ -1,10 +1,10 @@
-use api_entity_crud::EntityCrud;
+use crate::api_entity_crud::EntityCrud;
 use data_encoding::BASE32_NOPAD;
-use database_models::*;
-use database_schema::*;
+use crate::database_models::*;
+use crate::database_schema::*;
 use diesel;
 use diesel::prelude::*;
-use errors::*;
+use crate::errors::*;
 use fatcat_api_spec::models::*;
 use regex::Regex;
 use serde_json;
diff --git a/rust/src/api_server.rs b/rust/src/api_server.rs
index 349c6a27..0377f970 100644
--- a/rust/src/api_server.rs
+++ b/rust/src/api_server.rs
@@ -1,18 +1,18 @@
 //! API endpoint handlers
 
-use api_entity_crud::EntityCrud;
-use api_helpers::*;
-use auth::*;
+use crate::api_entity_crud::EntityCrud;
+use crate::api_helpers::*;
+use crate::auth::*;
 use chrono;
-use database_models::*;
-use database_schema::*;
+use crate::database_models::*;
+use crate::database_schema::*;
 use diesel::prelude::*;
 use diesel::{self, insert_into};
-use errors::*;
+use crate::errors::*;
 use fatcat_api_spec::models;
 use fatcat_api_spec::models::*;
 use std::str::FromStr;
-use ConnectionPool;
+use crate::ConnectionPool;
 
 macro_rules! entity_batch_handler {
     ($post_batch_handler:ident, $model:ident) => {
diff --git a/rust/src/api_wrappers.rs b/rust/src/api_wrappers.rs
index f03d4041..69bdd88e 100644
--- a/rust/src/api_wrappers.rs
+++ b/rust/src/api_wrappers.rs
@@ -1,12 +1,12 @@
 //! API endpoint handlers
 
-use api_entity_crud::EntityCrud;
-use api_helpers::*;
-use api_server::Server;
-use auth::*;
-use database_models::EntityEditRow;
+use crate::api_entity_crud::EntityCrud;
+use crate::api_helpers::*;
+use crate::api_server::Server;
+use crate::auth::*;
+use crate::database_models::EntityEditRow;
 use diesel::Connection;
-use errors::*;
+use crate::errors::*;
 use fatcat_api_spec::models;
 use fatcat_api_spec::models::*;
 use fatcat_api_spec::*;
diff --git a/rust/src/auth.rs b/rust/src/auth.rs
index d4e03ecf..da038b6b 100644
--- a/rust/src/auth.rs
+++ b/rust/src/auth.rs
@@ -5,13 +5,13 @@ use macaroon::{Format, Macaroon, Verifier};
 use std::fmt;
 use swagger::auth::{AuthData, Authorization, Scopes};
 
-use api_helpers::*;
+use crate::api_helpers::*;
 use chrono::prelude::*;
-use database_models::*;
-use database_schema::*;
+use crate::database_models::*;
+use crate::database_schema::*;
 use diesel;
 use diesel::prelude::*;
-use errors::*;
+use crate::errors::*;
 use std::collections::HashMap;
 use std::str::FromStr;
 
diff --git a/rust/src/database_models.rs b/rust/src/database_models.rs
index 59953f6b..ad9aaf29 100644
--- a/rust/src/database_models.rs
+++ b/rust/src/database_models.rs
@@ -1,9 +1,9 @@
 #![allow(proc_macro_derive_resolution_fallback)]
 
-use api_helpers::uuid2fcid;
+use crate::api_helpers::uuid2fcid;
 use chrono;
-use database_schema::*;
-use errors::*;
+use crate::database_schema::*;
+use crate::errors::*;
 use fatcat_api_spec::models::{ChangelogEntry, Editgroup, Editor, EntityEdit};
 use serde_json;
 use uuid::Uuid;
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 0d9ef813..18550a5d 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -92,10 +92,10 @@ pub mod errors {
 }
 
 #[doc(hidden)]
-pub use errors::*;
+pub use crate::errors::*;
 
 pub use self::errors::*;
-use auth::AuthConfectionary;
+use crate::auth::AuthConfectionary;
 use diesel::pg::PgConnection;
 use diesel::r2d2::ConnectionManager;
 use dotenv::dotenv;
-- 
cgit v1.2.3