Skip to content

Commit

Permalink
fix(rustup): CowString is gone
Browse files Browse the repository at this point in the history
  • Loading branch information
renato-zannon authored and seanmonstar committed Feb 21, 2015
1 parent 598d8f9 commit 98b8c4b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions src/header/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ use std::borrow::Cow::{Borrowed, Owned};
use std::fmt;
use std::raw::TraitObject;
use std::str::from_utf8;
use std::string::CowString;
use std::collections::HashMap;
use std::collections::hash_map::{Iter, Entry};
use std::iter::{FromIterator, IntoIterator};
use std::borrow::IntoCow;
use std::borrow::{Cow, IntoCow};
use std::{mem, raw};

use uany::{UnsafeAnyExt};
Expand All @@ -30,7 +29,7 @@ mod common;
mod shared;
pub mod parsing;

type HeaderName = UniCase<CowString<'static>>;
type HeaderName = UniCase<Cow<'static, str>>;

/// A trait for any object that will represent a header field and value.
///
Expand Down
5 changes: 2 additions & 3 deletions src/http.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
//! Pieces pertaining to the HTTP message protocol.
use std::borrow::Cow::{Borrowed, Owned};
use std::borrow::Cow::{self, Borrowed, Owned};
use std::borrow::IntoCow;
use std::cmp::min;
use std::old_io::{self, Reader, IoResult, BufWriter};
use std::num::from_u16;
use std::str;
use std::string::CowString;

use url::Url;
use url::ParseError as UrlError;
Expand Down Expand Up @@ -587,7 +586,7 @@ pub type StatusLine = (HttpVersion, RawStatus);

/// The raw status code and reason-phrase.
#[derive(PartialEq, Debug)]
pub struct RawStatus(pub u16, pub CowString<'static>);
pub struct RawStatus(pub u16, pub Cow<'static, str>);

impl Clone for RawStatus {
fn clone(&self) -> RawStatus {
Expand Down

0 comments on commit 98b8c4b

Please sign in to comment.