fix(rustup): update to newest fmt trait names and slice syntax

This commit is contained in:
Sean McArthur
2015-01-23 14:17:19 -08:00
parent bb4f913ede
commit 9e3c94d764
38 changed files with 90 additions and 114 deletions

View File

@@ -7,7 +7,7 @@ pub use self::Encoding::{Chunked, Gzip, Deflate, Compress, Identity, EncodingExt
/// A value to represent an encoding used in `Transfer-Encoding`
/// or `Accept-Encoding` header.
#[derive(Clone, PartialEq)]
#[derive(Clone, PartialEq, Debug)]
pub enum Encoding {
/// The `chunked` encoding.
Chunked,
@@ -23,9 +23,9 @@ pub enum Encoding {
EncodingExt(String)
}
impl fmt::String for Encoding {
impl fmt::Display for Encoding {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
write!(fmt, "{}", match *self {
fmt.write_str(match *self {
Chunked => "chunked",
Gzip => "gzip",
Deflate => "deflate",
@@ -33,13 +33,7 @@ impl fmt::String for Encoding {
Identity => "identity",
EncodingExt(ref s) => s.as_slice()
})
}
}
impl fmt::Show for Encoding {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
self.to_string().fmt(fmt)
}
}
}
impl str::FromStr for Encoding {

View File

@@ -9,7 +9,7 @@ use std::str;
/// Represents an item with a quality value as defined in
/// [RFC7231](https://tools.ietf.org/html/rfc7231#section-5.3.1).
#[derive(Clone, PartialEq)]
#[derive(Clone, PartialEq, Debug)]
pub struct QualityItem<T> {
/// The actual contents of the field.
pub item: T,
@@ -26,13 +26,7 @@ impl<T> QualityItem<T> {
}
}
impl<T: fmt::String> fmt::String for QualityItem<T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}; q={}", self.item, format!("{:.3}", self.quality).trim_right_matches(['0', '.'].as_slice()))
}
}
impl<T: fmt::String> fmt::Show for QualityItem<T> {
impl<T: fmt::Display> fmt::Display for QualityItem<T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}; q={}", self.item, format!("{:.3}", self.quality).trim_right_matches(['0', '.'].as_slice()))
}
@@ -46,9 +40,9 @@ impl<T: str::FromStr> str::FromStr for QualityItem<T> {
let parts: Vec<&str> = s.rsplitn(1, ';').map(|x| x.trim()).collect();
if parts.len() == 2 {
let start = parts[0].slice(0, 2);
let start = &parts[0][0..2];
if start == "q=" || start == "Q=" {
let q_part = parts[0].slice(2, parts[0].len());
let q_part = &parts[0][2..parts[0].len()];
if q_part.len() > 5 {
return None;
}