rdkafka-sys: upgrade to librdkafka v1.4.2

Also allow rdkafka and rdkafka-sys to be versioned independently by
making rdkafka-sys follow SemVer. This will fix future scenarios like
the one described in issue fede1024#211.

Cargo.toml

@@ -11,7 +11,7 @@ categories = ["api-bindings"]
 edition = "2018"
 
 [dependencies]
-rdkafka-sys = { path = "rdkafka-sys", version = "1.3.1", default-features = false }
+rdkafka-sys = { path = "rdkafka-sys", version = "2.0.0", default-features = false }
 futures = "0.3.0"
 libc = "0.2.0"
 log = "0.4.8"

changelog.md

@@ -1,5 +1,21 @@
 # Changelog
 
+See also the [rdkafka-sys changelog](rdkafka-sys/changelog.md).
+
+<a name="0.24.0"></a>
+## 0.24.0 (Unreleased)
+
+* Decouple versioning of rdkafka-sys from rdkafka. rdkafka-sys now has its
+  own [changelog](rdkafka-sys/changelog.md) and will follow SemVer conventions.
+  ([#211])
+
+[#211]: https://github.com/fede1024/rust-rdkafka/issues/211
+
+<a name="0.23.1"></a>
+## 0.23.1 (2020-01-13)
+
+* Fix build on docs.rs.
+
 <a name="0.23.0"></a>
 ## 0.23.0 (2019-12-31)
 

rdkafka-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rdkafka-sys"
-version = "1.3.1"
+version = "2.0.0+1.4.2"
 authors = ["Federico Giraud <[email protected]>"]
 build = "build.rs"
 links = "rdkafka"

rdkafka-sys/README.md

@@ -14,9 +14,12 @@ cargo install bindgen
 
 ## Version
 
-The rdkafka-sys version number is in the format `X.Y.Z-P`, where `X.Y.Z`
-corresponds to the librdkafka version, and `P` indicates the version of the
-rust bindings.
+The rdkafka-sys version number is in the format `X.Y.Z+RX.RY.RZ`, where `X.Y.Z`
+is the version of this crate and follows SemVer conventions, while `RX.RY.RZ`
+is the version of the bundled librdkafka.
+
+Note that versions before v2.0.0+1.4.2 did not follow this convention, and
+instead directly corresponded to the bundled librdkafka version.
 
 ## Build
 

rdkafka-sys/build.rs

@@ -38,11 +38,6 @@ where
 }
 
 fn main() {
-    let librdkafka_version = env!("CARGO_PKG_VERSION")
-        .split('-')
-        .next()
-        .expect("Crate version is not valid");
-
     if env::var("DEP_OPENSSL_VENDORED").is_ok() {
         let openssl_root = env::var("DEP_OPENSSL_ROOT").expect("DEP_OPENSSL_ROOT is not set");
         env::set_var("CFLAGS", format!("-I{}/include", openssl_root));
@@ -51,6 +46,16 @@ fn main() {
 
     if env::var("CARGO_FEATURE_DYNAMIC_LINKING").is_ok() {
         eprintln!("librdkafka will be linked dynamically");
+
+        let librdkafka_version = match env!("CARGO_PKG_VERSION")
+            .split('+')
+            .collect::<Vec<_>>()
+            .as_slice()
+        {
+            [_rdsys_version, librdkafka_version] => *librdkafka_version,
+            _ => panic!("Version format is not valid"),
+        };
+
         let pkg_probe = pkg_config::Config::new()
             .cargo_metadata(true)
             .atleast_version(librdkafka_version)

rdkafka-sys/changelog.md

@@ -0,0 +1,10 @@
+# Changelog
+
+<a name="2.0.0+1.4.2"></a>
+## v2.0.0+1.4.2 (Unreleased)
+
+* Start separate changelog for rdkafka-sys.
+
+* Upgrade to librdkafka v1.4.2.
+
+* Correct several references to `usize` in the generated bindings to `size_t`.