Merge pull request #145 from hoeppnertill/master
Fix for ASCII_LOWER_MAP visibility and deprecation warnings
This commit is contained in:
		| @@ -5,7 +5,7 @@ | |||||||
| //! must implement the `Header` trait from this module. Several common headers | //! must implement the `Header` trait from this module. Several common headers | ||||||
| //! are already provided, such as `Host`, `ContentType`, `UserAgent`, and others. | //! are already provided, such as `Host`, `ContentType`, `UserAgent`, and others. | ||||||
| use std::any::Any; | use std::any::Any; | ||||||
| use std::ascii::{AsciiExt, ASCII_LOWER_MAP}; | use std::ascii::{AsciiExt, AsciiCast}; | ||||||
| use std::fmt::{mod, Show}; | use std::fmt::{mod, Show}; | ||||||
| use std::intrinsics::TypeId; | use std::intrinsics::TypeId; | ||||||
| use std::raw::TraitObject; | use std::raw::TraitObject; | ||||||
| @@ -417,8 +417,8 @@ impl<S: Str, S2: Str> Equiv<CaseInsensitive<S2>> for CaseInsensitive<S> { | |||||||
| impl<S: Str, H: hash::Writer> hash::Hash<H> for CaseInsensitive<S> { | impl<S: Str, H: hash::Writer> hash::Hash<H> for CaseInsensitive<S> { | ||||||
|     #[inline] |     #[inline] | ||||||
|     fn hash(&self, hasher: &mut H) { |     fn hash(&self, hasher: &mut H) { | ||||||
|         for byte in self.as_slice().bytes() { |         for b in self.as_slice().bytes() { | ||||||
|             hasher.write([ASCII_LOWER_MAP[byte as uint]].as_slice()); |             hasher.write(&[b.to_ascii().to_lowercase().as_byte()]) | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -358,9 +358,8 @@ pub fn read_method<R: Reader>(stream: &mut R) -> HttpResult<method::Method> { | |||||||
|     match (maybe_method, buf[]) { |     match (maybe_method, buf[]) { | ||||||
|         (Some(method), _) => Ok(method), |         (Some(method), _) => Ok(method), | ||||||
|         (None, ext) => { |         (None, ext) => { | ||||||
|             use std::str::raw; |  | ||||||
|             // We already checked that the buffer is ASCII |             // We already checked that the buffer is ASCII | ||||||
|             Ok(method::Method::Extension(unsafe { raw::from_utf8(ext) }.trim().into_string())) |             Ok(method::Method::Extension(unsafe { str::from_utf8_unchecked(ext) }.trim().into_string())) | ||||||
|         }, |         }, | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user