Rust update.

Author: chris-morgan

Cargo.toml

@@ -1,7 +1,14 @@
 [package]
 name = "http"
 version = "0.1.0-pre"
-authors = [ "Chris Morgan <[email protected]>" ]
+authors = ["Chris Morgan <[email protected]>"]
+description = "Obsolete HTTP library"
+#documentation = 
+#homepage = 
+repository = "https://github.com/chris-morgan/rust-http"
+readme = "README.rst"
+keywords = ["web", "http", "library"]
+license = "MIT/Apache-2.0"
 build = "codegen/main.rs"
 
 [features]

codegen/branchify.rs

@@ -27,7 +27,7 @@ pub fn branchify(options: &[(&str, &str)], case_sensitive: bool) -> Vec<ParseBra
     fn go_down_moses(branch: &mut ParseBranch, mut chariter: Chars, result: &str, case_sensitive: bool) {
         match chariter.next() {
             Some(c) => {
-                let first_case = if case_sensitive { c as u8 } else { c.to_ascii().to_uppercase().to_byte() };
+                let first_case = if case_sensitive { c as u8 } else { c.to_ascii().to_uppercase().as_byte() };
                 for next_branch in branch.children.iter_mut() {
                     if next_branch.matches[0] == first_case {
                         go_down_moses(next_branch, chariter, result, case_sensitive);
@@ -37,7 +37,7 @@ pub fn branchify(options: &[(&str, &str)], case_sensitive: bool) -> Vec<ParseBra
                 let mut subbranch = ParseBranch::new();
                 subbranch.matches.push(first_case);
                 if !case_sensitive {
-                    let second_case = c.to_ascii().to_lowercase().to_byte();
+                    let second_case = c.to_ascii().to_lowercase().as_byte();
                     if first_case != second_case {
                         subbranch.matches.push(second_case);
                     }

codegen/status.rs

@@ -59,8 +59,8 @@ fn camel_case(msg: &str) -> String {
     let mut capitalise = true;
     for c in msg[].chars() {
         let c = match capitalise {
-            true => c.to_ascii().to_uppercase().to_char(),
-            false => c.to_ascii().to_lowercase().to_char(),
+            true => c.to_ascii().to_uppercase().as_char(),
+            false => c.to_ascii().to_lowercase().as_char(),
         };
         // For a space, capitalise the next char
         capitalise = c == ' ';
@@ -166,7 +166,7 @@ pub mod status {
 use std::fmt;
 use std::ascii::AsciiExt;
 
-use self::Status::*;
+pub use self::Status::*;
 
 /// HTTP status code
 #[deriving(Eq, PartialEq, Clone)]

examples/request_uri.rs

@@ -13,7 +13,7 @@ use std::io::net::ip::{SocketAddr, Ipv4Addr};
 use std::io::Writer;
 
 use http::server::{Config, Server, Request, ResponseWriter};
-use http::server::request::{Star, AbsoluteUri, AbsolutePath, Authority};
+use http::server::request::RequestUri::{Star, AbsoluteUri, AbsolutePath, Authority};
 use http::status::{BadRequest, MethodNotAllowed};
 use http::method::{Get, Head, Post, Put, Delete, Trace, Options, Connect, Patch};
 use http::headers::content_type::MediaType;

src/http/client/sslclients/openssl.rs

@@ -6,7 +6,7 @@ extern crate openssl;
 use std::io::net::ip::SocketAddr;
 use std::io::net::tcp::TcpStream;
 use std::io::{IoResult, IoError, ConnectionAborted, OtherIoError};
-use self::openssl::ssl::{SslStream, SslContext, Sslv23, Ssl};
+use self::openssl::ssl::{SslStream, SslContext, SslMethod, Ssl};
 use self::openssl::ssl::error::{SslError, StreamError, SslSessionClosed, OpenSslErrors};
 use self::NetworkStream::{NormalStream, SslProtectedStream};
 use connecter::Connecter;
@@ -23,7 +23,7 @@ impl Connecter for NetworkStream {
     fn connect(addr: SocketAddr, host: &str, use_ssl: bool) -> IoResult<NetworkStream> {
         let stream = try!(TcpStream::connect(addr));
         if use_ssl {
-            let context = try!(SslContext::new(Sslv23).map_err(lift_ssl_error));
+            let context = try!(SslContext::new(SslMethod::Sslv23).map_err(lift_ssl_error));
             let ssl = try!(Ssl::new(&context).map_err(lift_ssl_error));
             try!(ssl.set_hostname(host).map_err(lift_ssl_error));
             let ssl_stream = try!(SslStream::new_from(ssl, stream).map_err(lift_ssl_error));

src/http/headers/accept_ranges.rs

@@ -3,8 +3,8 @@
 use std::io::IoResult;
 use std::ascii::AsciiExt;
 
-use self::AcceptableRanges::{RangeUnits, NoAcceptableRanges};
-use self::RangeUnit::{Bytes, OtherRangeUnit};
+pub use self::AcceptableRanges::{RangeUnits, NoAcceptableRanges};
+pub use self::RangeUnit::{Bytes, OtherRangeUnit};
 
 #[deriving(Clone, PartialEq, Eq)]
 // RFC 2616: range-unit = bytes-unit | other-range-unit

src/http/headers/serialization_utils.rs

@@ -28,9 +28,9 @@ pub fn normalise_header_name(name: &String) -> String {
             true => c.to_ascii().to_uppercase(),
             false => c.to_ascii().to_lowercase(),
         };
-        result.push(c.to_char());
+        result.push(c.as_char());
         // ASCII 45 is '-': in that case, capitalise the next char
-        capitalise = c.to_byte() == 45;
+        capitalise = c.as_byte() == 45;
     }
     result
 }

src/http/headers/transfer_encoding.rs

@@ -6,7 +6,7 @@ use std::ascii::AsciiExt;
 use std::io::IoResult;
 use headers::serialization_utils::{WriterUtil, push_parameters};
 
-use self::TransferCoding::{Chunked, TransferExtension};
+pub use self::TransferCoding::{Chunked, TransferExtension};
 
 /// RFC 2616, section 3.6:
 ///

src/http/lib.rs

@@ -1,10 +1,5 @@
 #![crate_name = "http"]
 
-#![comment = "Rust HTTP server"]
-#![license = "MIT/ASL2"]
-#![crate_type = "dylib"]
-#![crate_type = "rlib"]
-
 #![doc(html_root_url = "http://www.rust-ci.org/chris-morgan/rust-http/doc/")]
 
 #![deny(non_camel_case_types)]

src/http/method.rs

@@ -1,8 +1,8 @@
 use std::fmt;
 use std::str::FromStr;
 
-use self::Method::{Options, Get, Head, Post, Put, Delete, Trace,
-                   Connect, Patch, ExtensionMethod};
+pub use self::Method::{Options, Get, Head, Post, Put, Delete, Trace,
+                       Connect, Patch, ExtensionMethod};
 
 /// HTTP methods, as defined in RFC 2616, §5.1.1.
 ///