examples -> 2018

rwf2 · May 29, 2019 · 6024851 · 6024851
1 parent 0d432c7
commit 6024851
Show file tree

Hide file tree

Showing 38 changed files with 38 additions and 6 deletions.
diff --git a/examples/config/Cargo.toml b/examples/config/Cargo.toml
@@ -2,6 +2,7 @@
 name = "config"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/content_types/Cargo.toml b/examples/content_types/Cargo.toml
@@ -2,6 +2,7 @@
 name = "content_types"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/cookies/Cargo.toml b/examples/cookies/Cargo.toml
@@ -2,6 +2,7 @@
 name = "cookies"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/errors/Cargo.toml b/examples/errors/Cargo.toml
@@ -2,6 +2,7 @@
 name = "errors"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/fairings/Cargo.toml b/examples/fairings/Cargo.toml
@@ -2,6 +2,7 @@
 name = "fairings"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/form_kitchen_sink/Cargo.toml b/examples/form_kitchen_sink/Cargo.toml
@@ -2,6 +2,7 @@
 name = "form_kitchen_sink"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/form_validation/Cargo.toml b/examples/form_validation/Cargo.toml
@@ -2,6 +2,7 @@
 name = "form_validation"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/handlebars_templates/Cargo.toml b/examples/handlebars_templates/Cargo.toml
@@ -2,6 +2,7 @@
 name = "handlebars_templates"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/handlebars_templates/src/main.rs b/examples/handlebars_templates/src/main.rs
@@ -10,7 +10,7 @@ use rocket::Request;
 use rocket::response::Redirect;
 use rocket_contrib::templates::{Template, handlebars};
 
-use handlebars::{Helper, Handlebars, Context, RenderContext, Output, HelperResult, JsonRender};
+use crate::handlebars::{Helper, Handlebars, Context, RenderContext, Output, HelperResult, JsonRender};
 
 #[derive(Serialize)]
 struct TemplateContext {

diff --git a/examples/hello_2018/Cargo.toml b/examples/hello_2018/Cargo.toml
@@ -2,8 +2,8 @@
 name = "hello_2018"
 version = "0.0.0"
 workspace = "../../"
-publish = false
 edition = "2018"
+publish = false
 
 [dependencies]
 rocket = { path = "../../core/lib" }
diff --git a/examples/hello_person/Cargo.toml b/examples/hello_person/Cargo.toml
@@ -2,6 +2,7 @@
 name = "hello_person"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml
@@ -2,6 +2,7 @@
 name = "hello_world"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/json/Cargo.toml b/examples/json/Cargo.toml
@@ -2,6 +2,7 @@
 name = "json"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/json/src/tests.rs b/examples/json/src/tests.rs
@@ -1,4 +1,4 @@
-use rocket;
+use crate::rocket;
 use rocket::local::Client;
 use rocket::http::{Status, ContentType};
 

diff --git a/examples/managed_queue/Cargo.toml b/examples/managed_queue/Cargo.toml
@@ -2,6 +2,7 @@
 name = "managed_queue"
 version = "0.0.0"
 workspace = "../.."
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/manual_routes/Cargo.toml b/examples/manual_routes/Cargo.toml
@@ -2,6 +2,7 @@
 name = "manual_routes"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/msgpack/Cargo.toml b/examples/msgpack/Cargo.toml
@@ -2,6 +2,7 @@
 name = "msgpack"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/msgpack/src/tests.rs b/examples/msgpack/src/tests.rs
@@ -1,4 +1,4 @@
-use rocket;
+use crate::rocket;
 use rocket::local::Client;
 use rocket::http::{Status, ContentType};
 

diff --git a/examples/optional_redirect/Cargo.toml b/examples/optional_redirect/Cargo.toml
@@ -2,6 +2,7 @@
 name = "optional_redirect"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/pastebin/Cargo.toml b/examples/pastebin/Cargo.toml
@@ -2,6 +2,7 @@
 name = "pastebin"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/pastebin/src/main.rs b/examples/pastebin/src/main.rs
@@ -13,7 +13,7 @@ use std::path::Path;
 use rocket::Data;
 use rocket::response::content;
 
-use paste_id::PasteID;
+use crate::paste_id::PasteID;
 
 const HOST: &str = "http://localhost:8000";
 const ID_LENGTH: usize = 3;

diff --git a/examples/query_params/Cargo.toml b/examples/query_params/Cargo.toml
@@ -2,6 +2,7 @@
 name = "query_params"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/ranking/Cargo.toml b/examples/ranking/Cargo.toml
@@ -2,6 +2,7 @@
 name = "ranking"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/raw_sqlite/Cargo.toml b/examples/raw_sqlite/Cargo.toml
@@ -2,6 +2,7 @@
 name = "raw_sqlite"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/raw_upload/Cargo.toml b/examples/raw_upload/Cargo.toml
@@ -2,6 +2,7 @@
 name = "raw_upload"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/redirect/Cargo.toml b/examples/redirect/Cargo.toml
@@ -2,6 +2,7 @@
 name = "redirect"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/request_guard/Cargo.toml b/examples/request_guard/Cargo.toml
@@ -2,6 +2,7 @@
 name = "request_guard"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/request_local_state/Cargo.toml b/examples/request_local_state/Cargo.toml
@@ -2,6 +2,7 @@
 name = "request_local_state"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/session/Cargo.toml b/examples/session/Cargo.toml
@@ -2,6 +2,7 @@
 name = "session"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/state/Cargo.toml b/examples/state/Cargo.toml
@@ -2,6 +2,7 @@
 name = "state"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/static_files/Cargo.toml b/examples/static_files/Cargo.toml
@@ -2,6 +2,7 @@
 name = "static_files"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
@@ -2,6 +2,7 @@
 name = "stream"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/tera_templates/Cargo.toml b/examples/tera_templates/Cargo.toml
@@ -2,6 +2,7 @@
 name = "tera_templates"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/testing/Cargo.toml b/examples/testing/Cargo.toml
@@ -2,6 +2,7 @@
 name = "testing"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/tls/Cargo.toml b/examples/tls/Cargo.toml
@@ -2,6 +2,7 @@
 name = "tls"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/todo/Cargo.toml b/examples/todo/Cargo.toml
@@ -2,6 +2,7 @@
 name = "todo"
 version = "0.0.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]

diff --git a/examples/todo/src/main.rs b/examples/todo/src/main.rs
@@ -17,7 +17,7 @@ use rocket::response::{Flash, Redirect};
 use rocket_contrib::{templates::Template, serve::StaticFiles};
 use diesel::SqliteConnection;
 
-use task::{Task, Todo};
+use crate::task::{Task, Todo};
 
 // This macro from `diesel_migrations` defines an `embedded_migrations` module
 // containing a function named `run`. This allows the example to be run and

diff --git a/examples/uuid/Cargo.toml b/examples/uuid/Cargo.toml
@@ -2,6 +2,7 @@
 name = "uuid"
 version = "0.1.0"
 workspace = "../../"
+edition = "2018"
 publish = false
 
 [dependencies]