Merge commit 'refs/pull/511/head' of github.com:servo/rust-url into 2.0

Author: SimonSapin

src/lib.rs

@@ -210,20 +210,6 @@ impl<'a> ParseOptions<'a> {
         self
     }
 
-    /// Call the provided function or closure on non-fatal parse errors, passing
-    /// a static string description.  This method is deprecated in favor of
-    /// `syntax_violation_callback` and is implemented as an adaptor for the
-    /// latter, passing the `SyntaxViolation` description. Only the last value
-    /// passed to either method will be used by a parser.
-    #[deprecated]
-    pub fn log_syntax_violation(mut self, new: Option<&'a dyn Fn(&'static str)>) -> Self {
-        self.violation_fn = match new {
-            Some(f) => ViolationFn::OldFn(f),
-            None => ViolationFn::NoOp
-        };
-        self
-    }
-
     /// Call the provided function or closure for a non-fatal `SyntaxViolation`
     /// when it occurs during parsing. Note that since the provided function is
     /// `Fn`, the caller might need to utilize _interior mutability_, such as with

src/parser.rs

@@ -272,7 +272,6 @@ impl<'i> Iterator for Input<'i> {
 #[derive(Copy, Clone)]
 pub enum ViolationFn<'a> {
     NewFn(&'a (dyn Fn(SyntaxViolation) + 'a)),
-    OldFn(&'a (dyn Fn(&'static str) + 'a)),
     NoOp
 }
 
@@ -281,7 +280,6 @@ impl<'a> ViolationFn<'a> {
     pub fn call(self, v: SyntaxViolation) {
         match self {
             ViolationFn::NewFn(f) => f(v),
-            ViolationFn::OldFn(f) => f(v.description()),
             ViolationFn::NoOp => {}
         }
     }
@@ -293,7 +291,6 @@ impl<'a> ViolationFn<'a> {
     {
         match self {
             ViolationFn::NewFn(f) => if test() { f(v) },
-            ViolationFn::OldFn(f) => if test() { f(v.description()) },
             ViolationFn::NoOp => {} // avoid test
         }
     }
@@ -311,7 +308,6 @@ impl<'a> fmt::Debug for ViolationFn<'a> {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         match *self {
             ViolationFn::NewFn(_) => write!(f, "NewFn(Fn(SyntaxViolation))"),
-            ViolationFn::OldFn(_) => write!(f, "OldFn(Fn(&'static str))"),
             ViolationFn::NoOp     => write!(f, "NoOp")
         }
     }

tests/unit.rs

@@ -489,21 +489,6 @@ fn test_windows_unc_path() {
     assert!(url.is_err());
 }
 
-// Test the now deprecated log_syntax_violation method for backward
-// compatibility
-#[test]
-#[allow(deprecated)]
-fn test_old_log_violation_option() {
-    let violation = Cell::new(None);
-    let url = Url::options()
-        .log_syntax_violation(Some(&|s| violation.set(Some(s.to_owned()))))
-        .parse("http:////mozilla.org:42").unwrap();
-    assert_eq!(url.port(), Some(42));
-
-    let violation = violation.take();
-    assert_eq!(violation, Some("expected //".to_string()));
-}
-
 #[test]
 fn test_syntax_violation_callback() {
     use url::SyntaxViolation::*;