From ac7d7aa8dbd4b8ec29a41436204312ac8b87b9f6 Mon Sep 17 00:00:00 2001
From: messense <messense@icloud.com>
Date: Wed, 21 Oct 2015 15:40:06 +0800
Subject: [PATCH] Refactor some API to be more generic over Rust strings

---
 src/lib.rs   | 21 ++++++++++++---------
 tests/lib.rs |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 15c129f..fe24fa9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -122,8 +122,8 @@ impl Entry {
 
 
 impl RobotFileParser {
-    pub fn new(url: &str) -> RobotFileParser {
-        let parsed_url = Url::parse(url).unwrap();
+    pub fn new<T: AsRef<str>>(url: T) -> RobotFileParser {
+        let parsed_url = Url::parse(url.as_ref()).unwrap();
         RobotFileParser {
             entries: RefCell::new(vec![]),
             default_entry: RefCell::new(Entry::new()),
@@ -153,8 +153,8 @@ impl RobotFileParser {
     }
 
     /// Sets the URL referring to a robots.txt file.
-    pub fn set_url(&mut self, url: &str) {
-        let parsed_url = Url::parse(url).unwrap();
+    pub fn set_url<T: AsRef<str>>(&mut self, url: T) {
+        let parsed_url = Url::parse(url.as_ref()).unwrap();
         self.url = parsed_url.clone();
         self.host = parsed_url.domain().unwrap().to_owned();
         self.path = parsed_url.path().unwrap().join("/");
@@ -181,7 +181,7 @@ impl RobotFileParser {
                 let mut buf = String::new();
                 res.read_to_string(&mut buf).unwrap();
                 let lines: Vec<&str> = buf.split("\n").collect();
-                self.parse(lines);
+                self.parse(&lines);
             },
             _ => {},
         }
@@ -207,7 +207,7 @@ impl RobotFileParser {
     /// We allow that a user-agent: line is not preceded by
     /// one or more blank lines.
     ///
-    pub fn parse(&self, lines: Vec<&str>) {
+    pub fn parse<T: AsRef<str>>(&self, lines: &[T]) {
         use url::percent_encoding::percent_decode;
 
         // states:
@@ -218,8 +218,8 @@ impl RobotFileParser {
         let mut entry = Entry::new();
 
         self.modified();
-        for line in &lines {
-            let mut ln = line.clone();
+        for line in lines {
+            let mut ln = line.as_ref().clone();
             if ln.is_empty() {
                 match state {
                     1 => {
@@ -280,9 +280,12 @@ impl RobotFileParser {
     }
 
     /// Using the parsed robots.txt decide if useragent can fetch url
-    pub fn can_fetch(&self, useragent: &str, url: &str) -> bool {
+    pub fn can_fetch<T: AsRef<str>>(&self, useragent: T, url: T) -> bool {
         use url::percent_encoding::percent_decode;
 
+        let useragent = useragent.as_ref();
+        let url = url.as_ref();
+
         if self.disallow_all.get() {
             return false;
         }
diff --git a/tests/lib.rs b/tests/lib.rs
index 9d1975d..bc5f9d4 100644
--- a/tests/lib.rs
+++ b/tests/lib.rs
@@ -8,7 +8,7 @@ const AGENT: &'static str = "test_robotparser";
 fn robot_test(doc: &str, good_urls: Vec<&str>, bad_urls: Vec<&str>, agent: &str) {
     let parser = RobotFileParser::new("http://www.baidu.com/robots.txt");
     let lines: Vec<&str> = doc.split("\n").collect();
-    parser.parse(lines);
+    parser.parse(&lines);
     for url in &good_urls {
         assert!(parser.can_fetch(agent, url));
     }