serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't try to handle fragment in router.

Browse source 
It is strictly a client-side mechanism
This commit is contained in:
Magnus Hoff 2017-10-02 21:35:52 +02:00
parent cdcdf8e72f
commit b21a7ccda4
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/site.rs
View file

@ -77,7 +77,7 @@ impl Service for Site {
let (method, uri, _http_version, _headers, body) = req.deconstruct(); let (method, uri, _http_version, _headers, body) = req.deconstruct();
println!("{} {}", method, uri); println!("{} {}", method, uri);
Box::new(self.root.lookup(uri.path(), uri.query(), None /*uri.fragment()*/) Box::new(self.root.lookup(uri.path(), uri.query())
.and_then(move |resource| match resource { .and_then(move |resource| match resource {
Some(resource) => { Some(resource) => {
use hyper::Method::*; use hyper::Method::*;

2
src/web/lookup.rs
View file

@ -5,5 +5,5 @@ pub trait Lookup {
type Error; type Error;
type Future: futures::Future<Item=Option<Self::Resource>, Error=Self::Error>; type Future: futures::Future<Item=Option<Self::Resource>, Error=Self::Error>;
fn lookup(&self, path: &str, query: Option<&str>, fragment: Option<&str>) -> Self::Future; fn lookup(&self, path: &str, query: Option<&str>) -> Self::Future;
} }

2
src/wiki_lookup.rs
View file

@ -59,7 +59,7 @@ impl Lookup for WikiLookup {
type Error = Box<::std::error::Error + Send + Sync>; type Error = Box<::std::error::Error + Send + Sync>;
type Future = Box<Future<Item = Option<Self::Resource>, Error = Self::Error>>; type Future = Box<Future<Item = Option<Self::Resource>, Error = Self::Error>>;
fn lookup(&self, path: &str, query: Option<&str>, _fragment: Option<&str>) -> Self::Future { fn lookup(&self, path: &str, query: Option<&str>) -> Self::Future {
assert!(path.starts_with("/")); assert!(path.starts_with("/"));
if path.starts_with("/_") { if path.starts_with("/_") {