rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed macros to codegen.

This commit is contained in:
Sergio Benitez 2016-09-08 20:38:58 -07:00
parent f14dec0728
commit 46f73ed57c
60 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -8,7 +8,7 @@ application:
```rust ```rust
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
macros/Cargo.toml → codegen/Cargo.toml
View File

@ -1,5 +1,5 @@
[package] [package]
name = "rocket_macros" name = "rocket_codegen"
version = "0.0.6" version = "0.0.6"
authors = ["Sergio Benitez <sb@sergio.bz>"] authors = ["Sergio Benitez <sb@sergio.bz>"]

0
macros/src/decorators/derive_form.rs → codegen/src/decorators/derive_form.rs
View File

0
macros/src/decorators/error.rs → codegen/src/decorators/error.rs
View File

0
macros/src/decorators/mod.rs → codegen/src/decorators/mod.rs
View File

0
macros/src/decorators/route.rs → codegen/src/decorators/route.rs
View File

0
macros/src/lib.rs → codegen/src/lib.rs
View File

0
macros/src/macros/mod.rs → codegen/src/macros/mod.rs
View File

0
macros/src/parser/error.rs → codegen/src/parser/error.rs
View File

0
macros/src/parser/function.rs → codegen/src/parser/function.rs
View File

0
macros/src/parser/keyvalue.rs → codegen/src/parser/keyvalue.rs
View File

0
macros/src/parser/mod.rs → codegen/src/parser/mod.rs
View File

0
macros/src/parser/param.rs → codegen/src/parser/param.rs
View File

0
macros/src/parser/route.rs → codegen/src/parser/route.rs
View File

0
macros/src/utils/arg_ext.rs → codegen/src/utils/arg_ext.rs
View File

0
macros/src/utils/ident_ext.rs → codegen/src/utils/ident_ext.rs
View File

0
macros/src/utils/meta_item_ext.rs → codegen/src/utils/meta_item_ext.rs
View File

0
macros/src/utils/mod.rs → codegen/src/utils/mod.rs
View File

0
macros/src/utils/parser_ext.rs → codegen/src/utils/parser_ext.rs
View File

0
macros/src/utils/span_ext.rs → codegen/src/utils/span_ext.rs
View File

2
macros/tests/compile-fail/bad-ident-argument.rs → codegen/tests/compile-fail/bad-ident-argument.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;

2
macros/tests/compile-fail/ignored_params.rs → codegen/tests/compile-fail/ignored_params.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
#[get("/<name>")] //~ ERROR 'name' is declared #[get("/<name>")] //~ ERROR 'name' is declared
fn get(other: &str) -> &'static str { "hi" } //~ ERROR isn't in the function fn get(other: &str) -> &'static str { "hi" } //~ ERROR isn't in the function

2
macros/tests/compile-fail/malformed-param-list.rs → codegen/tests/compile-fail/malformed-param-list.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
#[get("/><")] //~ ERROR malformed #[get("/><")] //~ ERROR malformed
fn get() -> &'static str { "hi" } fn get() -> &'static str { "hi" }

2
macros/tests/compile-fail/phantom-declared-param.rs → codegen/tests/compile-fail/phantom-declared-param.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
#[get("/<param>")] //~ ERROR declared #[get("/<param>")] //~ ERROR declared
fn get() { } //~ ERROR isn't in the function signature fn get() { } //~ ERROR isn't in the function signature

2
macros/tests/run-pass/empty-fn.rs → codegen/tests/run-pass/empty-fn.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;

2
macros/tests/run-pass/issue-1-colliding-names.rs → codegen/tests/run-pass/issue-1-colliding-names.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;

0
macros/tests/tests.rs → codegen/tests/tests.rs
View File

2
examples/content_types/Cargo.toml
View File

@ -6,7 +6,7 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }
serde = "0.8" serde = "0.8"
serde_json = "0.8" serde_json = "0.8"
serde_macros = "0.8" serde_macros = "0.8"

2
examples/content_types/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin, custom_derive)] #![feature(plugin, custom_derive)]
#![plugin(rocket_macros, serde_macros)] #![plugin(rocket_codegen, serde_macros)]
extern crate rocket; extern crate rocket;
extern crate serde_json; extern crate serde_json;

2
examples/cookies/Cargo.toml
View File

@ -6,6 +6,6 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }
lazy_static = "*" lazy_static = "*"
tera = { git = "https://github.com/Keats/tera" } tera = { git = "https://github.com/Keats/tera" }

2
examples/cookies/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin, custom_derive, custom_attribute)] #![feature(plugin, custom_derive, custom_attribute)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;

2
examples/errors/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/errors/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::{Rocket, Error, Request}; use rocket::{Rocket, Error, Request};

2
examples/extended_validation/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/extended_validation/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin, custom_derive)] #![feature(plugin, custom_derive)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;

2
examples/forms/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/forms/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin, custom_derive)] #![feature(plugin, custom_derive)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;

2
examples/from_request/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/from_request/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;

2
examples/hello_person/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/hello_person/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
examples/hello_ranks/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/hello_ranks/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
examples/hello_world/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/hello_world/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
examples/optional_redirect/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/optional_redirect/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
examples/optional_result/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/optional_result/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
examples/query_params/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/query_params/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin, custom_derive)] #![feature(plugin, custom_derive)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;

2
examples/redirect/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/redirect/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
examples/static_files/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/static_files/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
examples/testing/Cargo.toml
View File

@ -6,4 +6,4 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }

2
examples/testing/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin)] #![feature(plugin)]
#![plugin(rocket_macros)] #![plugin(rocket_codegen)]
extern crate rocket; extern crate rocket;
use rocket::Rocket; use rocket::Rocket;

2
examples/todo/Cargo.toml
View File

@ -6,7 +6,7 @@ workspace = "../../"
[dependencies] [dependencies]
rocket = { path = "../../lib" } rocket = { path = "../../lib" }
rocket_macros = { path = "../../macros" } rocket_codegen = { path = "../../codegen" }
lazy_static = "*" lazy_static = "*"
tera = { git = "https://github.com/Keats/tera" } tera = { git = "https://github.com/Keats/tera" }
serde = "0.8" serde = "0.8"

2
examples/todo/src/main.rs
View File

@ -1,5 +1,5 @@
#![feature(plugin, custom_derive, custom_attribute)] #![feature(plugin, custom_derive, custom_attribute)]
#![plugin(rocket_macros, serde_macros, diesel_codegen)] #![plugin(rocket_codegen, serde_macros, diesel_codegen)]
extern crate rocket; extern crate rocket;
extern crate tera; extern crate tera;

8
scripts/test.sh
View File

@ -3,7 +3,7 @@ set -e
EXAMPLES_DIR="examples" EXAMPLES_DIR="examples"
LIB_DIR="lib" LIB_DIR="lib"
MACROS_DIR="macros" CODEGEN_DIR="codegen"
# Add Cargo to PATH. # Add Cargo to PATH.
export PATH=${HOME}/.cargo/bin:${PATH} export PATH=${HOME}/.cargo/bin:${PATH}
@ -17,15 +17,15 @@ function build_and_test() {
pushd ${dir} pushd ${dir}
echo ":: Building '${PWD}'..." echo ":: Building '${PWD}'..."
cargo build --verbose RUST_BACKTRACE=1 cargo build
echo ":: Running unit tests in '${PWD}'..." echo ":: Running unit tests in '${PWD}'..."
cargo test --verbose RUST_BACKTRACE=1 cargo test
popd popd
} }
build_and_test $LIB_DIR build_and_test $LIB_DIR
build_and_test $MACROS_DIR build_and_test $CODEGEN_DIR
for file in ${EXAMPLES_DIR}/*; do for file in ${EXAMPLES_DIR}/*; do
if [ -d "${file}" ]; then if [ -d "${file}" ]; then