Merge pull request #1948 from steveklabnik/rust_updates

Rust updates

frameworks/Rust/hyper/src/main.rs

@@ -5,7 +5,7 @@ use hyper::uri::RequestUri;
 use hyper::header::ContentType;
 use hyper::header;
 
-const HELLO_WORLD: &'static [u8; 14] = b"Hello, World!\n";
+const HELLO_WORLD: &'static [u8; 13] = b"Hello, World!";
 
 fn main() {
     Server::http("0.0.0.0:8080").unwrap().handle(handler).unwrap();
@@ -14,7 +14,7 @@ fn main() {
 fn handler(req: Request, mut res: Response) {
     match (req.method, req.uri) {
         (hyper::Get, RequestUri::AbsolutePath(ref path)) if path == "/plaintext" => {
-            res.headers_mut().set(ContentType::plaintext());
+            res.headers_mut().set(ContentType("text/plain".parse().unwrap()));
             res.headers_mut().set(header::Server("Hyper".to_owned()));
 
             res.send(HELLO_WORLD).unwrap();

frameworks/Rust/iron/src/main.rs

@@ -6,6 +6,9 @@ use iron::{Iron, Request, Response, IronResult};
 use iron::status;
 use router::Router;
 use rustc_serialize::json;
+use iron::mime::Mime;
+use iron::headers::Server;
+use iron::modifiers::Header;
 
 #[derive(RustcDecodable, RustcEncodable)]
 struct Message {
@@ -22,9 +25,12 @@ fn main() {
 
 fn json_handler(_: &mut Request) -> IronResult<Response> {
     let message: Message = Message { message: "Hello, World!".to_string() };
-    Ok(Response::with((status::Ok, json::encode(&message).unwrap())))
+    let mime: Mime = "application/json".parse().unwrap();
+    let server = Header(Server(String::from("Iron")));
+    Ok(Response::with((status::Ok, json::encode(&message).unwrap(), mime, server)))
 }
 
 fn plaintext_handler(_: &mut Request) -> IronResult<Response> {
-    Ok(Response::with((status::Ok, "Hello, World!")))
+    let server = Header(Server(String::from("Iron")));
+    Ok(Response::with((status::Ok, "Hello, World!", server)))
 }