move mime behind an opt-in feature

Author: tsnoam

Cargo.toml

@@ -54,6 +54,7 @@ zlib-ng-compat = ["curl-sys/zlib-ng-compat", "static-curl"]
 upkeep_7_62_0 = ["curl-sys/upkeep_7_62_0"]
 poll_7_68_0 = ["curl-sys/poll_7_68_0"]
 ntlm = ["curl-sys/ntlm"]
+mime = ["curl-sys/mime"]
 
 [[test]]
 name = "atexit"

curl-sys/Cargo.toml

@@ -58,3 +58,4 @@ zlib-ng-compat = ["libz-sys/zlib-ng", "static-curl"]
 upkeep_7_62_0 = []
 poll_7_68_0 = []
 ntlm = []
+mime = []

curl-sys/lib.rs

@@ -1166,21 +1166,31 @@ extern "C" {
         sockfd: curl_socket_t,
         sockp: *mut c_void,
     ) -> CURLMcode;
+}
 
-    pub fn curl_mime_init(easy_handle: *mut CURL) -> *mut curl_mime;
-    pub fn curl_mime_free(mime_handle: *mut curl_mime);
-    pub fn curl_mime_addpart(mime_handle: *mut curl_mime) -> *mut curl_mimepart;
-    pub fn curl_mime_data(
-        mimepart: *mut curl_mimepart,
-        data: *const c_char,
-        datasize: size_t,
-    ) -> CURLcode;
-    pub fn curl_mime_name(part: *mut curl_mimepart, name: *const c_char) -> CURLcode;
-    pub fn curl_mime_filename(part: *mut curl_mimepart, filename: *const c_char) -> CURLcode;
-    pub fn curl_mime_type(part: *mut curl_mimepart, mimetype: *const c_char) -> CURLcode;
-    pub fn curl_mime_subparts(part: *mut curl_mimepart, subparts: *mut curl_mime) -> CURLcode;
+#[cfg(feature = "mime")]
+mod mime {
+    use super::*;
+
+    extern "C" {
+        pub fn curl_mime_init(easy_handle: *mut CURL) -> *mut curl_mime;
+        pub fn curl_mime_free(mime_handle: *mut curl_mime);
+        pub fn curl_mime_addpart(mime_handle: *mut curl_mime) -> *mut curl_mimepart;
+        pub fn curl_mime_data(
+            mimepart: *mut curl_mimepart,
+            data: *const c_char,
+            datasize: size_t,
+        ) -> CURLcode;
+        pub fn curl_mime_name(part: *mut curl_mimepart, name: *const c_char) -> CURLcode;
+        pub fn curl_mime_filename(part: *mut curl_mimepart, filename: *const c_char) -> CURLcode;
+        pub fn curl_mime_type(part: *mut curl_mimepart, mimetype: *const c_char) -> CURLcode;
+        pub fn curl_mime_subparts(part: *mut curl_mimepart, subparts: *mut curl_mime) -> CURLcode;
+    }
 }
 
+#[cfg(feature = "mime")]
+pub use mime::*;
+
 pub fn rust_crate_version() -> &'static str {
     env!("CARGO_PKG_VERSION")
 }

src/easy/handle.rs

@@ -12,6 +12,7 @@ use libc::c_void;
 use crate::easy::handler::{self, InfoType, ReadError, SeekResult, WriteError};
 use crate::easy::handler::{Auth, NetRc, PostRedirections, ProxyType, SslOpt};
 use crate::easy::handler::{HttpVersion, IpResolve, SslVersion, TimeCondition};
+#[cfg(feature = "mime")]
 use crate::easy::mime::Mime;
 use crate::easy::{Easy2, Handler};
 use crate::easy::{Form, List};
@@ -1472,6 +1473,7 @@ impl Easy {
         self.inner.take_error_buf()
     }
 
+    #[cfg(feature = "mime")]
     /// Same as [`Easy2::add_mime`](struct.Easy2.html#method.add_mime)
     pub fn add_mime(&mut self) -> Mime<EasyData> {
         self.inner.add_mime()

src/easy/handler.rs

@@ -15,6 +15,7 @@ use socket2::Socket;
 
 use crate::easy::form;
 use crate::easy::list;
+#[cfg(feature = "mime")]
 use crate::easy::mime::Mime;
 use crate::easy::windows;
 use crate::easy::{Form, List};
@@ -379,6 +380,7 @@ pub fn ssl_ctx(cx: *mut c_void) -> Result<(), Error> {
 /// ```
 pub struct Easy2<H> {
     inner: Box<Inner<H>>,
+    #[cfg(feature = "mime")]
     /// Mime handles to free upon drop
     mimes: Vec<*mut curl_sys::curl_mime>,
 }
@@ -602,6 +604,7 @@ impl<H: Handler> Easy2<H> {
                     error_buf: RefCell::new(vec![0; curl_sys::CURL_ERROR_SIZE]),
                     handler,
                 }),
+                #[cfg(feature = "mime")]
                 mimes: vec![],
             };
             ret.default_configure();
@@ -3513,7 +3516,10 @@ impl<H> Easy2<H> {
         }
         Err(err)
     }
+}
 
+#[cfg(feature = "mime")]
+impl<H> Easy2<H> {
     /// Create a mime handle attached to this [Easy2] instance.
     pub fn add_mime(&mut self) -> Mime<H> {
         Mime::new(self)
@@ -3542,6 +3548,8 @@ impl<H> Drop for Easy2<H> {
     fn drop(&mut self) {
         unsafe {
             curl_sys::curl_easy_cleanup(self.inner.handle);
+
+            #[cfg(feature = "mime")]
             for &mime_handle in self.mimes.iter() {
                 curl_sys::curl_mime_free(mime_handle);
             }

src/easy/mod.rs

@@ -11,6 +11,7 @@ mod form;
 mod handle;
 mod handler;
 mod list;
+#[cfg(feature = "mime")]
 mod mime;
 mod windows;