From d269c90e72a3069f07d90d3ef70e1c7cd53935d6 Mon Sep 17 00:00:00 2001 From: Adam Reeve Date: Thu, 2 Jul 2015 20:42:46 +0000 Subject: [PATCH 1/5] refactor(rustup): Fix reference to rustc-serialize crate --- src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index 00fd0d2..a780b6c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,7 @@ extern crate postgres; extern crate rustless; extern crate typemap; extern crate time; -extern crate "rustc-serialize" as rustc_serialize; +extern crate rustc_serialize; extern crate iron; extern crate docopt; extern crate uuid; @@ -132,4 +132,4 @@ fn main() { println!("Migration with name {} was generated.", name); } -} \ No newline at end of file +} From 9796e7a113b170f00620649706e026afa0833099 Mon Sep 17 00:00:00 2001 From: Adam Reeve Date: Thu, 2 Jul 2015 20:46:54 +0000 Subject: [PATCH 2/5] refactor(rustup): Fix use of String.as_slice --- src/models/tweet.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/models/tweet.rs b/src/models/tweet.rs index e0861ec..bbd3084 100644 --- a/src/models/tweet.rs +++ b/src/models/tweet.rs @@ -14,8 +14,8 @@ pub struct Tweet { impl Tweet { pub fn get_id(&self) -> &uuid::Uuid { &self.id } - pub fn get_author_name(&self) -> &str { self.author_name.as_slice() } - pub fn get_content(&self) -> &str { self.content.as_slice() } + pub fn get_author_name(&self) -> &str { &self.author_name } + pub fn get_content(&self) -> &str { &self.content } pub fn get_created_at(&self) -> &time::Timespec { &self.created_at } pub fn get_updated_at(&self) -> &time::Timespec { &self.updated_at } @@ -90,4 +90,4 @@ impl Tweet { &self.id, ]).unwrap(); } -} \ No newline at end of file +} From 6d8334b08358b443dfee2ebe89dbe9a3c38c7223 Mon Sep 17 00:00:00 2001 From: Adam Reeve Date: Thu, 2 Jul 2015 20:51:15 +0000 Subject: [PATCH 3/5] refactor(rustup): Fix PathBuf creation --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index a780b6c..2bcf4d8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -126,7 +126,7 @@ fn main() { let name = deuterium_orm::migration::create_migration_file( &args.arg_migration_name[..], - path::PathBuf::new("src/db/migrations") + path::PathBuf::from("src/db/migrations") ); println!("Migration with name {} was generated.", name); From a5f680b7f8194d6eb97178f88a0833936227b174 Mon Sep 17 00:00:00 2001 From: Adam Reeve Date: Thu, 2 Jul 2015 20:55:54 +0000 Subject: [PATCH 4/5] refactor(rustup): Fix feature usage attributes --- src/main.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2bcf4d8..4bc6bbc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,5 @@ #![feature(plugin)] -#![feature(core)] -#![feature(path)] -#![feature(net)] +#![feature(ip_addr)] #![plugin(deuterium_plugin)] #![plugin(docopt_macros)] From 0890f4bb18902a54c26157e66c5b7282f6b0898f Mon Sep 17 00:00:00 2001 From: Adam Reeve Date: Thu, 2 Jul 2015 21:35:24 +0000 Subject: [PATCH 5/5] fix(postgres_example): Fix docopt flags --- src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 4bc6bbc..2dd348a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,11 +38,12 @@ docopt!(Args derive Debug, " Example backend. Usage: - backend run + backend [--ip=] [--port=] run backend g migration backend db migrate [] backend db rollback [] backend --version + backend --help Options: -h --help Show this screen.