rust-embed

rust macro which loads files into the rust binary at compile time during release and loads the file from the fs during dev.

9f7aa882 — Mark Drobnak

Merge pull request #91 from paolobarbolini/update-deps1

Files changed (2) hide show

Cargo.toml CHANGED Viewed

@@ -15,8 +15,8 @@ walkdir = "2.2.7"
 rust-embed-impl = { version = "5.1.0", path = "impl"}
 rust-embed-utils = { version = "5.0.0", path = "utils"}
-actix-web = { version = "0.7", optional = true }
+actix-web = { version = "1", optional = true }
-mime_guess = { version = "2.0.0-alpha.6", optional = true }
+mime_guess = { version = "2", optional = true }
 warp = { version = "0.1", optional = true }
 rocket = { version = "0.4.2", optional = true }

examples/actix.rs CHANGED Viewed

@@ -3,9 +3,9 @@ extern crate actix_web;
 extern crate rust_embed;
 extern crate mime_guess;
-use actix_web::http::Method;
+use actix_web::body::Body;
-use actix_web::{server, App, Body, HttpRequest, HttpResponse};
+use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer};
-use mime_guess::guess_mime_type;
+use mime_guess::from_path;
 use std::borrow::Cow;
 #[derive(RustEmbed)]
@@ -19,7 +19,7 @@ fn handle_embedded_file(path: &str) -> HttpResponse {
         Cow::Borrowed(bytes) => bytes.into(),
         Cow::Owned(bytes) => bytes.into(),
       };
-      HttpResponse::Ok().content_type(guess_mime_type(path).as_ref()).body(body)
+      HttpResponse::Ok().content_type(from_path(path).first_or_octet_stream().as_ref()).body(body)
     }
     None => HttpResponse::NotFound().body("404 Not Found"),
   }
@@ -35,8 +35,13 @@ fn dist(req: HttpRequest) -> HttpResponse {
 }
 fn main() {
+  HttpServer::new(|| {
+    App::new()
+      .service(web::resource("/").route(web::get().to(index)))
-  server::new(|| App::new().route("/", Method::GET, index).route("/dist/{_:.*}", Method::GET, dist))
+      .service(web::resource("/dist/{_:.*}").route(web::get().to(dist)))
+  })
-    .bind("127.0.0.1:8000")
+  .bind("127.0.0.1:8000")
-    .unwrap()
+  .unwrap()
-    .run();
+  .run()
+  .unwrap();
 }