From 3293ab14e24d136d0482bb18afef577aebed251e Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 21 Nov 2014 17:10:42 -0500 Subject: Deprecate MaybeOwned[Vector] in favor of Cow --- src/libregex/re.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/libregex') diff --git a/src/libregex/re.rs b/src/libregex/re.rs index e70491a785c..58ce72a3173 100644 --- a/src/libregex/re.rs +++ b/src/libregex/re.rs @@ -13,7 +13,7 @@ pub use self::Regex::*; use std::collections::HashMap; use std::fmt; -use std::str::{MaybeOwned, Owned, Slice}; +use std::str::CowString; use compile::Program; use parse; @@ -565,25 +565,25 @@ pub trait Replacer { /// /// The `'a` lifetime refers to the lifetime of a borrowed string when /// a new owned string isn't needed (e.g., for `NoExpand`). - fn reg_replace<'a>(&'a mut self, caps: &Captures) -> MaybeOwned<'a>; + fn reg_replace<'a>(&'a mut self, caps: &Captures) -> CowString<'a>; } impl<'t> Replacer for NoExpand<'t> { - fn reg_replace<'a>(&'a mut self, _: &Captures) -> MaybeOwned<'a> { + fn reg_replace<'a>(&'a mut self, _: &Captures) -> CowString<'a> { let NoExpand(s) = *self; - Slice(s) + s.into_cow() } } impl<'t> Replacer for &'t str { - fn reg_replace<'a>(&'a mut self, caps: &Captures) -> MaybeOwned<'a> { - Owned(caps.expand(*self)) + fn reg_replace<'a>(&'a mut self, caps: &Captures) -> CowString<'a> { + caps.expand(*self).into_cow() } } impl<'t> Replacer for |&Captures|: 't -> String { - fn reg_replace<'a>(&'a mut self, caps: &Captures) -> MaybeOwned<'a> { - Owned((*self)(caps)) + fn reg_replace<'a>(&'a mut self, caps: &Captures) -> CowString<'a> { + (*self)(caps).into_cow() } } -- cgit 1.4.1-3-g733a5