Update curl submodule and crate versions (#330)

Author: alexcrichton

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "curl"
-version = "0.4.28"
+version = "0.4.29"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT"
 repository = "https://github.com/alexcrichton/curl-rust"
@@ -16,7 +16,7 @@ appveyor = { repository = "alexcrichton/curl-rust" }
 
 [dependencies]
 libc = "0.2.42"
-curl-sys = { path = "curl-sys", version = "0.4.30", default-features = false }
+curl-sys = { path = "curl-sys", version = "0.4.31", default-features = false }
 socket2 = "0.3.7"
 
 # Unix platforms use OpenSSL for now to provide SSL functionality

curl-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "curl-sys"
-version = "0.4.30+curl-7.69.1"
+version = "0.4.31+curl-7.70.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 links = "curl"
 build = "build.rs"

curl-sys/curl

@@ -799,7 +799,8 @@ pub const CURLVERSION_THIRD: CURLversion = 2;
 pub const CURLVERSION_FOURTH: CURLversion = 3;
 pub const CURLVERSION_FIFTH: CURLversion = 4;
 pub const CURLVERSION_SIXTH: CURLversion = 5;
-pub const CURLVERSION_NOW: CURLversion = CURLVERSION_SIXTH;
+pub const CURLVERSION_SEVENTH: CURLversion = 6;
+pub const CURLVERSION_NOW: CURLversion = CURLVERSION_SEVENTH;
 
 #[repr(C)]
 pub struct curl_version_info_data {
@@ -822,6 +823,8 @@ pub struct curl_version_info_data {
     pub nghttp2_ver_num: c_uint,
     pub nghttp2_version: *const c_char,
     pub quic_version: *const c_char,
+    pub cainfo: *const c_char,
+    pub capath: *const c_char,
 }
 
 pub const CURL_VERSION_IPV6: c_int = 1 << 0;
@@ -842,6 +845,8 @@ pub const CURL_VERSION_TLSAUTH_SRP: c_int = 1 << 14;
 pub const CURL_VERSION_NTLM_WB: c_int = 1 << 15;
 pub const CURL_VERSION_HTTP2: c_int = 1 << 16;
 pub const CURL_VERSION_UNIX_SOCKETS: c_int = 1 << 19;
+pub const CURL_VERSION_BROTLI: c_int = 1 << 23;
+pub const CURL_VERSION_HTTP3: c_int = 1 << 25;
 
 pub const CURLPAUSE_RECV: c_int = 1 << 0;
 pub const CURLPAUSE_RECV_CONT: c_int = 0;

curl-sys/lib.rs

@@ -303,6 +303,16 @@ impl Error {
         self.code
     }
 
+    /// Returns the general description of this error code, using curl's
+    /// builtin `strerror`-like functionality.
+    pub fn description(&self) -> &str {
+        unsafe {
+            let s = curl_sys::curl_easy_strerror(self.code);
+            assert!(!s.is_null());
+            str::from_utf8(CStr::from_ptr(s).to_bytes()).unwrap()
+        }
+    }
+
     /// Returns the extra description of this error, if any is available.
     pub fn extra_description(&self) -> Option<&str> {
         self.extra.as_ref().map(|s| &**s)
@@ -311,7 +321,7 @@ impl Error {
 
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let desc = error::Error::description(self);
+        let desc = self.description();
         match self.extra {
             Some(ref s) => write!(f, "[{}] {} ({})", self.code(), desc, s),
             None => write!(f, "[{}] {}", self.code(), desc),
@@ -322,22 +332,14 @@ impl fmt::Display for Error {
 impl fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.debug_struct("Error")
-            .field("description", &error::Error::description(self))
+            .field("description", &self.description())
             .field("code", &self.code)
             .field("extra", &self.extra)
             .finish()
     }
 }
 
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        unsafe {
-            let s = curl_sys::curl_easy_strerror(self.code);
-            assert!(!s.is_null());
-            str::from_utf8(CStr::from_ptr(s).to_bytes()).unwrap()
-        }
-    }
-}
+impl error::Error for Error {}
 
 /// An error returned from "share" operations.
 ///
@@ -382,11 +384,20 @@ impl ShareError {
     pub fn code(&self) -> curl_sys::CURLSHcode {
         self.code
     }
+
+    /// Returns curl's human-readable version of this error.
+    pub fn description(&self) -> &str {
+        unsafe {
+            let s = curl_sys::curl_share_strerror(self.code);
+            assert!(!s.is_null());
+            str::from_utf8(CStr::from_ptr(s).to_bytes()).unwrap()
+        }
+    }
 }
 
 impl fmt::Display for ShareError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        error::Error::description(self).fmt(f)
+        self.description().fmt(f)
     }
 }
 
@@ -395,21 +406,13 @@ impl fmt::Debug for ShareError {
         write!(
             f,
             "ShareError {{ description: {:?}, code: {} }}",
-            error::Error::description(self),
+            self.description(),
             self.code
         )
     }
 }
 
-impl error::Error for ShareError {
-    fn description(&self) -> &str {
-        unsafe {
-            let s = curl_sys::curl_share_strerror(self.code);
-            assert!(!s.is_null());
-            str::from_utf8(CStr::from_ptr(s).to_bytes()).unwrap()
-        }
-    }
-}
+impl error::Error for ShareError {}
 
 /// An error from "multi" operations.
 ///
@@ -469,34 +472,33 @@ impl MultiError {
     pub fn code(&self) -> curl_sys::CURLMcode {
         self.code
     }
+
+    /// Returns curl's human-readable description of this error.
+    pub fn description(&self) -> &str {
+        unsafe {
+            let s = curl_sys::curl_multi_strerror(self.code);
+            assert!(!s.is_null());
+            str::from_utf8(CStr::from_ptr(s).to_bytes()).unwrap()
+        }
+    }
 }
 
 impl fmt::Display for MultiError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        error::Error::description(self).fmt(f)
+        self.description().fmt(f)
     }
 }
 
 impl fmt::Debug for MultiError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "MultiError {{ description: {:?}, code: {} }}",
-            error::Error::description(self),
-            self.code
-        )
+        f.debug_struct("MultiError")
+            .field("description", &self.description())
+            .field("code", &self.code)
+            .finish()
     }
 }
 
-impl error::Error for MultiError {
-    fn description(&self) -> &str {
-        unsafe {
-            let s = curl_sys::curl_multi_strerror(self.code);
-            assert!(!s.is_null());
-            str::from_utf8(CStr::from_ptr(s).to_bytes()).unwrap()
-        }
-    }
-}
+impl error::Error for MultiError {}
 
 /// An error from "form add" operations.
 ///
@@ -551,27 +553,9 @@ impl FormError {
     pub fn code(&self) -> curl_sys::CURLFORMcode {
         self.code
     }
-}
-
-impl fmt::Display for FormError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        error::Error::description(self).fmt(f)
-    }
-}
-
-impl fmt::Debug for FormError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "FormError {{ description: {:?}, code: {} }}",
-            error::Error::description(self),
-            self.code
-        )
-    }
-}
 
-impl error::Error for FormError {
-    fn description(&self) -> &str {
+    /// Returns a human-readable description of this error code.
+    pub fn description(&self) -> &str {
         match self.code {
             curl_sys::CURL_FORMADD_MEMORY => "allocation failure",
             curl_sys::CURL_FORMADD_OPTION_TWICE => "one option passed twice",
@@ -587,6 +571,23 @@ impl error::Error for FormError {
     }
 }
 
+impl fmt::Display for FormError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.description().fmt(f)
+    }
+}
+
+impl fmt::Debug for FormError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("FormError")
+            .field("description", &self.description())
+            .field("code", &self.code)
+            .finish()
+    }
+}
+
+impl error::Error for FormError {}
+
 impl From<ffi::NulError> for Error {
     fn from(_: ffi::NulError) -> Error {
         Error {

src/error.rs

@@ -141,6 +141,16 @@ impl Version {
         self.flag(curl_sys::CURL_VERSION_HTTP2)
     }
 
+    /// Returns whether libcurl was built with support for HTTP3.
+    pub fn feature_http3(&self) -> bool {
+        self.flag(curl_sys::CURL_VERSION_HTTP3)
+    }
+
+    /// Returns whether libcurl was built with support for Brotli.
+    pub fn feature_brotli(&self) -> bool {
+        self.flag(curl_sys::CURL_VERSION_BROTLI)
+    }
+
     fn flag(&self, flag: c_int) -> bool {
         unsafe { (*self.inner).features & flag != 0 }
     }
@@ -278,6 +288,28 @@ impl Version {
             }
         }
     }
+
+    /// If available, the built-in default of CURLOPT_CAINFO.
+    pub fn cainfo(&self) -> Option<&str> {
+        unsafe {
+            if (*self.inner).age >= curl_sys::CURLVERSION_SEVENTH {
+                ::opt_str((*self.inner).cainfo)
+            } else {
+                None
+            }
+        }
+    }
+
+    /// If available, the built-in default of CURLOPT_CAPATH.
+    pub fn capath(&self) -> Option<&str> {
+        unsafe {
+            if (*self.inner).age >= curl_sys::CURLVERSION_SEVENTH {
+                ::opt_str((*self.inner).capath)
+            } else {
+                None
+            }
+        }
+    }
 }
 
 impl fmt::Debug for Version {

src/version.rs

@@ -50,7 +50,7 @@ fn main() {
     cfg.skip_signededness(|s| s.ends_with("callback") || s.ends_with("function"));
 
     cfg.skip_struct(move |s| {
-        if version < 65 {
+        if version < 70 {
             match s {
                 "curl_version_info_data" => return true,
                 _ => {}
@@ -61,9 +61,18 @@ fn main() {
     });
 
     cfg.skip_const(move |s| {
+        if version < 70 {
+            match s {
+                "CURL_VERSION_HTTP3"
+                | "CURL_VERSION_BROTLI"
+                | "CURLVERSION_SEVENTH"
+                | "CURLVERSION_NOW" => return true,
+                _ => {}
+            }
+        }
         if version < 65 {
             match s {
-                "CURLVERSION_SIXTH" | "CURLVERSION_NOW" => return true,
+                "CURLVERSION_SIXTH" => return true,
                 _ => {}
             }
         }