Kaynağa Gözat

Tidy up some small nits

Daniel Lockyer 9 yıl önce
ebeveyn
işleme
6db4c409e3
3 değiştirilmiş dosya ile 5 ekleme ve 5 silme
  1. 1 1
      src/host.rs
  2. 2 2
      src/parser.rs
  3. 2 2
      tests/data.rs

+ 1 - 1
src/host.rs

@@ -314,7 +314,7 @@ fn parse_ipv4number(mut input: &str) -> Result<u32, ()> {
     if input.starts_with('+') {
         return Err(())
     }
-    match u32::from_str_radix(&input, r) {
+    match u32::from_str_radix(input, r) {
         Ok(number) => Ok(number),
         Err(_) => Err(()),
     }

+ 2 - 2
src/parser.rs

@@ -854,7 +854,7 @@ impl<'a> Parser<'a> {
         if !has_any_digit || opt_port == default_port() {
             opt_port = None;
         }
-        return Ok((opt_port, input))
+        Ok((opt_port, input))
     }
 
     pub fn parse_path_start<'i>(&mut self, scheme_type: SchemeType, has_host: &mut bool,
@@ -1030,7 +1030,7 @@ impl<'a> Parser<'a> {
                 }
             }
             None => return Ok((None, None)),
-            _ => panic!("Programming error. parse_query_and_fragment() called without ? or # {:?}")
+            _ => panic!("Programming error. parse_query_and_fragment() called without ? or #")
         }
 
         let fragment_start = to_u32(self.serialization.len())?;

+ 2 - 2
tests/data.rs

@@ -26,7 +26,7 @@ fn check_invariants(url: &Url) {
 }
 
 
-fn run_parsing(input: String, base: String, expected: Result<ExpectedAttributes, ()>) {
+fn run_parsing(input: &String, base: &String, expected: Result<ExpectedAttributes, ()>) {
     let base = match Url::parse(&base) {
         Ok(base) => base,
         Err(message) => panic!("Error parsing base {:?}: {}", base, message)
@@ -135,7 +135,7 @@ fn collect_parsing<F: FnMut(String, test::TestFn)>(add_test: &mut F) {
             })
         };
         add_test(format!("{:?} @ base {:?}", input, base),
-                 test::TestFn::dyn_test_fn(move || run_parsing(input, base, expected)));
+                 test::TestFn::dyn_test_fn(move || run_parsing(&input, &base, expected)));
     }
 }