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

Slightly less mindless copying

Browse source
This commit is contained in:
Magnus Hoff 2017-10-02 21:47:21 +02:00
parent b21a7ccda4
commit 2a5f98d43e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/wiki_lookup.rs
View file

@ -11,7 +11,7 @@ use state::State;
use web::{Lookup, Resource};
type BoxResource = Box<Resource + Sync + Send>;
type ResourceFn = Box<Fn(State) -> BoxResource + Sync + Send>;
type ResourceFn = Box<Fn(&State) -> BoxResource + Sync + Send>;
lazy_static! {
static ref LOOKUP_MAP: HashMap<String, ResourceFn> = {
@ -19,24 +19,24 @@ lazy_static! {
lookup_map.insert(
"/_new".to_string(),
Box::new(|state|
Box::new(NewArticleResource::new(state, None)) as BoxResource
Box::new(|state: &State|
Box::new(NewArticleResource::new(state.clone(), None)) as BoxResource
) as ResourceFn
);
lookup_map.insert(
format!("/_assets/style-{}.css", StyleCss::checksum()),
Box::new(|_| Box::new(StyleCss) as BoxResource) as ResourceFn
Box::new(|_: &State| Box::new(StyleCss) as BoxResource) as ResourceFn
);
lookup_map.insert(
format!("/_assets/script-{}.js", ScriptJs::checksum()),
Box::new(|_| Box::new(ScriptJs) as BoxResource) as ResourceFn
Box::new(|_: &State| Box::new(ScriptJs) as BoxResource) as ResourceFn
);
lookup_map.insert(
format!("/_assets/amatic-sc-v9-latin-regular.woff"),
Box::new(|_| Box::new(AmaticFont) as BoxResource) as ResourceFn
Box::new(|_: &State| Box::new(AmaticFont) as BoxResource) as ResourceFn
);
lookup_map
@ -66,7 +66,7 @@ impl Lookup for WikiLookup {
// Reserved namespace
return Box::new(finished(
LOOKUP_MAP.get(path).map(|x| x(self.state.clone()))
LOOKUP_MAP.get(path).map(|x| x(&self.state))
));
}