aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMelody Horn / boringcactus <melody@boringcactus.com>2021-06-13 13:39:02 -0600
committerMelody Horn / boringcactus <melody@boringcactus.com>2021-06-13 13:39:02 -0600
commitcc7d316e588c21de1023d6a76d4ea5e7b893977a (patch)
tree47586de87551cf41756fc9f1f02a30b439251a60 /examples
parent6a2f8ab0b2c7028636ddf06a7dd776f5f8b3ace6 (diff)
downloadtosin-cc7d316e588c21de1023d6a76d4ea5e7b893977a.tar.gz
tosin-cc7d316e588c21de1023d6a76d4ea5e7b893977a.zip
macro based url map definition
Diffstat (limited to 'examples')
-rw-r--r--examples/tutorial01/main.rs11
-rw-r--r--examples/tutorial01/polls/urls.rs8
2 files changed, 9 insertions, 10 deletions
diff --git a/examples/tutorial01/main.rs b/examples/tutorial01/main.rs
index 4db9897..f99ae7f 100644
--- a/examples/tutorial01/main.rs
+++ b/examples/tutorial01/main.rs
@@ -1,15 +1,14 @@
use tosin::Settings;
use tosin::contrib::admin;
-use tosin::http::Filter;
-use tosin::urls::{UrlMap, path};
+use tosin::urls::{UrlMap, url_map};
mod polls;
fn urls() -> UrlMap {
- path!("polls" / ..).and(polls::urls::urls())
- .or(path!("admin" / ..).and(admin::site::urls::urls()))
- .unify()
- .boxed()
+ url_map! {
+ "polls" / ..polls::urls::urls(),
+ "admin" / ..admin::site::urls::urls(),
+ }
}
fn settings() -> Settings {
diff --git a/examples/tutorial01/polls/urls.rs b/examples/tutorial01/polls/urls.rs
index 184c6f8..04d93cc 100644
--- a/examples/tutorial01/polls/urls.rs
+++ b/examples/tutorial01/polls/urls.rs
@@ -1,9 +1,9 @@
-use tosin::http::Filter;
-use tosin::urls::{UrlMap, path};
+use tosin::urls::{UrlMap, url_map};
use super::views;
pub fn urls() -> UrlMap {
- path::end().map(views::index) // TODO name: "index"
- .boxed()
+ url_map! {
+ => views::index, // TODO name: "index"
+ }
}