rollup merge of #19038: jayelm/fixed-typos

[rust.git] / src / libregex / re.rs

diff --git a/src/libregex/re.rs b/src/libregex/re.rs
index df5bfccd18d63a6c3317cb3efc928bc776ce1561..e70491a785c370b27ecb643153559eb1a3ece86b 100644 (file)
--- a/src/libregex/re.rs
+++ b/src/libregex/re.rs
@@ -8,9 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+pub use self::NamesIter::*;
+pub use self::Regex::*;
+
 use std::collections::HashMap;
 use std::fmt;
-use std::from_str::from_str;
 use std::str::{MaybeOwned, Owned, Slice};
 
 use compile::Program;
@@ -559,7 +561,7 @@ fn next(&mut self) -> Option<Option<String>> {
 /// Replacer describes types that can be used to replace matches in a string.
 pub trait Replacer {
     /// Returns a possibly owned string that is used to replace the match
-    /// corresponding the the `caps` capture group.
+    /// corresponding to the `caps` capture group.
     ///
     /// The `'a` lifetime refers to the lifetime of a borrowed string when
     /// a new owned string isn't needed (e.g., for `NoExpand`).
@@ -724,7 +726,7 @@ pub fn name(&self, name: &str) -> &'t str {
         match self.named {
             None => "",
             Some(ref h) => {
-                match h.find_equiv(name) {
+                match h.get(name) {
                     None => "",
                     Some(i) => self.at(*i),
                 }