From 42d14c943eb31753489b39ef58803c543c023bee Mon Sep 17 00:00:00 2001 From: Melody Horn Date: Mon, 28 Jun 2021 17:12:33 -0600 Subject: fmt --- examples/tutorial02/main.rs | 19 +++++++------------ examples/tutorial02/polls/migrations/mod.rs | 2 +- examples/tutorial02/polls/models.rs | 6 +++--- examples/tutorial02/polls/urls.rs | 2 +- 4 files changed, 12 insertions(+), 17 deletions(-) (limited to 'examples/tutorial02') diff --git a/examples/tutorial02/main.rs b/examples/tutorial02/main.rs index bac20e1..2abac0c 100644 --- a/examples/tutorial02/main.rs +++ b/examples/tutorial02/main.rs @@ -1,9 +1,10 @@ -#[macro_use] extern crate diesel; +#[macro_use] +extern crate diesel; -use tosin::Settings; use tosin::contrib::admin; use tosin::db::backend::Connectable; -use tosin::urls::{UrlMap, url_map}; +use tosin::urls::{url_map, UrlMap}; +use tosin::Settings; mod polls; @@ -16,10 +17,7 @@ fn urls() -> UrlMap { fn settings() -> Settings { Settings { - installed_apps: &[ - &polls::APP, - &admin::APP, - ], + installed_apps: &[&polls::APP, &admin::APP], ..Settings::default() } } @@ -33,7 +31,7 @@ mod test { #[test] fn test_models() { - use polls::models::{Choice, Question, choice, question}; + use polls::models::{choice, question, Choice, Question}; let settings = settings(); let connection = settings.database.connect().unwrap(); @@ -43,10 +41,7 @@ mod test { assert!(all_questions.is_empty()); // make a new one - let mut q = Question::new( - "What's new?".to_string(), - time::PrimitiveDateTime::now(), - ); + let mut q = Question::new("What's new?".to_string(), time::PrimitiveDateTime::now()); // save it q.save_mut(); // it's got an id now! diff --git a/examples/tutorial02/polls/migrations/mod.rs b/examples/tutorial02/polls/migrations/mod.rs index 64efe8d..56fe76d 100644 --- a/examples/tutorial02/polls/migrations/mod.rs +++ b/examples/tutorial02/polls/migrations/mod.rs @@ -1,3 +1,3 @@ -use tosin::db::migration::{Migration, gather}; +use tosin::db::migration::{gather, Migration}; gather!(); diff --git a/examples/tutorial02/polls/models.rs b/examples/tutorial02/polls/models.rs index c9de156..48e58cc 100644 --- a/examples/tutorial02/polls/models.rs +++ b/examples/tutorial02/polls/models.rs @@ -1,9 +1,9 @@ -use tosin::db::models::{Model, Id, gather}; +use tosin::db::models::{gather, Id, Model}; #[derive(Model, PartialEq, Debug)] pub struct Question { id: Option, - #[model(max_length=200)] + #[model(max_length = 200)] question_text: String, /// date published pub_date: chrono::NaiveDateTime, @@ -14,7 +14,7 @@ pub struct Choice { id: Option, #[model(Question, on_delete=Cascade)] question: Id, - #[model(max_length=200)] + #[model(max_length = 200)] choice_text: String, #[model(default = 0)] votes: usize, diff --git a/examples/tutorial02/polls/urls.rs b/examples/tutorial02/polls/urls.rs index 04d93cc..83f3ecb 100644 --- a/examples/tutorial02/polls/urls.rs +++ b/examples/tutorial02/polls/urls.rs @@ -1,4 +1,4 @@ -use tosin::urls::{UrlMap, url_map}; +use tosin::urls::{url_map, UrlMap}; use super::views; -- cgit v1.2.3