Formatting and dependency upgrade

Author: midnightexigent

.vscode/launch.json

@@ -2,37 +2,37 @@
 name = "kafka"
 version = "0.9.0"
 authors = ["Yousuf Fauzan", "Petr Novotnik <[email protected]>"]
-description = "Rust client for Apache Kafka"
-repository = "https://github.com/kafka-rust/kafka-rust"
-documentation = "https://docs.rs/kafka/"
-readme = "README.md"
-keywords = ["kafka", "queue"]
 categories = ["api-bindings"]
-license = "MIT"
+documentation = "https://docs.rs/kafka/"
 edition = "2021"
+keywords = ["kafka", "queue"]
+license = "MIT OR Apache-2.0"
+readme = "README.md"
+repository = "https://github.com/kafka-rust/kafka-rust"
+description = "Rust client for Apache Kafka"
 
 [dependencies]
 byteorder = "1.4.3"
-crc = "2.1.0"
-ref_slice = "1.2.1"
+crc = "3.0.0"
 fnv = "1.0.7"
-twox-hash = "1.6.2"
+ref_slice = "1.2.1"
+twox-hash = "1.6.3"
 
-flate2 = { version = "1.0.22", optional = true }
+flate2 = { version = "1.0.23", optional = true }
+openssl = { version = "0.10.40", optional = true }
+openssl-sys = { version = "0.9.73", optional = true }
 snap = { version = "1.0.5", optional = true }
-openssl = { version = "0.10.38", optional = true }
-openssl-sys = { version = "0.9.72", optional = true }
-thiserror = "1.0.30"
-tracing = "0.1.31"
+thiserror = "1.0.31"
+tracing = "0.1.34"
 
 [dev-dependencies]
-getopts = "0.2.21"
+anyhow = "1.0.57"
 env_logger = "0.9.0"
-time = "0.3.7"
-rand = "0.8.5"
+getopts = "0.2.21"
 lazy_static = "1.4.0"
-anyhow = "1.0.55"
-log = "0.4.16"
+log = "0.4.17"
+rand = "0.8.5"
+time = "0.3.9"
 
 [features]
 default = ["snappy", "gzip", "security"]

Cargo.toml

@@ -12,12 +12,11 @@ Welcome to kafka-rust's new home: https://github.com/kafka-rust
 
 ## Documentation
 
-* This library is primarily documented through examples in its [API
-  documentation](https://docs.rs/kafka/).
-* Documentation about Kafka itself can be found at [its project
-home page](http://kafka.apache.org/).
+- This library is primarily documented through examples in its [APIdocumentation](https://docs.rs/kafka/).
+- Documentation about Kafka itself can be found at [its projecthome page](http://kafka.apache.org/).
 
 ## Sponsors
+
 Thank you to our sponsers, this helps me to spend more time on this project and also helps with infrastructure
 
 <table>
@@ -30,13 +29,14 @@ Thank you to our sponsers, this helps me to spend more time on this project and
 
 <h3>Upstash: Serverless Kafka</h3>
 
-  <ul>
+<ul>
     <li>True Serverless Kafka with per-request-pricing</li>
     <li>Managed Apache Kafka, works with all Kafka clients</li>
     <li>Built-in REST API designed for serverless and edge functions</li>
   </ul>
 
-[Start for free in 30 seconds!](https://upstash.com/?utm_source=kafka-rust")
+[Start for free in 30 seconds!](https://upstash.com/?utm_source=kafka-rust)
+
 </td>
 </tr>
 </table>
@@ -55,8 +55,7 @@ kafka = "0.9"
 
 To build kafka-rust the usual `cargo build` should suffice. The crate
 supports various features which can be turned off at compile time.
-See kafka-rust's `Cargo.toml` and [cargo's
-documentation](http://doc.crates.io/manifest.html#the-features-section).
+See kafka-rust's `Cargo.toml` and [cargo'sdocumentation](http://doc.crates.io/manifest.html#the-features-section).
 
 ## Supported Kafka version
 
@@ -65,12 +64,9 @@ not all features from Kafka 0.9 and newer are supported yet.
 
 ## Examples
 
-As mentioned, the [cargo generated
-documentation](https://docs.rs/kafka/) contains some examples.
+As mentioned, the [cargo generateddocumentation](https://docs.rs/kafka/) contains some examples.
 Further, standalone, compilable example programs are provided in the
-[examples directory of the
-repository](https://github.com/spicavigo/kafka-rust/tree/master/examples).
-
+[examples directory of therepository](https://github.com/spicavigo/kafka-rust/tree/master/examples).
 
 ## Consumer
 
@@ -80,7 +76,6 @@ support on behalf of a specified group. This is the API a client
 application of this library wants to use for receiving messages from
 Kafka.
 
-
 ## Producer
 
 This is a higher-level producer API for Kafka and is provided by the
@@ -89,7 +84,6 @@ assignment capabilities through partitioners. This is the API a
 client application of this library wants to use for sending messsages
 to Kafka.
 
-
 ## KafkaClient
 
 `KafkaClient` in the `kafka::client` module is the central point of
@@ -98,13 +92,12 @@ suitable for building higher-level APIs. Applications typically want
 to use the already mentioned `Consumer` and `Producer`.
 Nevertheless, the main features or `KafkaClient` are:
 
-* Loading metadata
-* Fetching topic offsets
-* Sending messages
-* Fetching messages
-* Committing a consumer group's offsets
-* Fetching a consumer group's offsets
-
+- Loading metadata
+- Fetching topic offsets
+- Sending messages
+- Fetching messages
+- Committing a consumer group's offsets
+- Fetching a consumer group's offsets
 
 ## Bugs / Features / Contributing
 
@@ -126,7 +119,6 @@ Docker (1.10.0+) and docker-compose (1.6.0+) installed and run the tests via the
 included `run-all-tests` script in the `tests` directory. See the `run-all-tests`
 script itself for details on its usage.
 
-
 ## Creating a topic
 
 Note unless otherwise explicitly stated in the documentation, this
@@ -148,5 +140,5 @@ for more information.
 
 ## Alternative/Related projects
 
-* [rust-rdkafka](https://github.com/fede1024/rust-rdkafka) is an emerging alternative Kafka client library for Rust based on
+- [rust-rdkafka](https://github.com/fede1024/rust-rdkafka) is an emerging alternative Kafka client library for Rust based on
   `librdkafka`. rust-rdkafka provides a safe Rust interface to librdkafka.

README.md

@@ -0,0 +1,17 @@
+{
+  "json": {
+  },
+  "markdown": {
+  },
+  "toml": {
+  },
+  "includes": ["**/*.{json,md,toml}"],
+  "excludes": [
+    "/target"
+  ],
+  "plugins": [
+    "https://plugins.dprint.dev/json-0.15.2.wasm",
+    "https://plugins.dprint.dev/markdown-0.13.2.wasm",
+    "https://plugins.dprint.dev/toml-0.5.4.wasm"
+  ]
+}

dprint.json

@@ -90,11 +90,21 @@ impl Config {
         let args: Vec<_> = env::args().collect();
         let mut opts = getopts::Options::new();
         opts.optflag("h", "help", "Print this help screen");
-        opts.optopt("", "brokers", "Specify kafka brokers (comma separated)", "HOSTS");
+        opts.optopt(
+            "",
+            "brokers",
+            "Specify kafka brokers (comma separated)",
+            "HOSTS",
+        );
         opts.optopt("", "topics", "Specify topics (comma separated)", "NAMES");
         opts.optopt("", "group", "Specify the consumer group", "NAME");
         opts.optflag("", "no-commit", "Do not commit group offsets");
-        opts.optopt("", "storage", "Specify the offset store [zookeeper, kafka]", "STORE");
+        opts.optopt(
+            "",
+            "storage",
+            "Specify the offset store [zookeeper, kafka]",
+            "STORE",
+        );
         opts.optflag(
             "",
             "earliest",

examples/console-consumer.rs

@@ -187,10 +187,20 @@ impl Config {
         let args: Vec<String> = env::args().collect();
         let mut opts = getopts::Options::new();
         opts.optflag("h", "help", "Print this help screen");
-        opts.optopt("", "brokers", "Specify kafka brokers (comma separated)", "HOSTS");
+        opts.optopt(
+            "",
+            "brokers",
+            "Specify kafka brokers (comma separated)",
+            "HOSTS",
+        );
         opts.optopt("", "topic", "Specify target topic", "NAME");
         opts.optopt("", "input", "Specify input file", "FILE");
-        opts.optopt("", "compression", "Compress messages [NONE, GZIP, SNAPPY]", "TYPE");
+        opts.optopt(
+            "",
+            "compression",
+            "Compress messages [NONE, GZIP, SNAPPY]",
+            "TYPE",
+        );
         opts.optopt(
             "",
             "required-acks",
@@ -199,7 +209,12 @@ impl Config {
         );
         opts.optopt("", "ack-timeout", "Specify time to wait for acks", "MILLIS");
         opts.optopt("", "batch-size", "Send N message in one batch.", "N");
-        opts.optopt("", "idle-timeout", "Specify timeout for idle connections", "MILLIS");
+        opts.optopt(
+            "",
+            "idle-timeout",
+            "Specify timeout for idle connections",
+            "MILLIS",
+        );
 
         let m = match opts.parse(&args[1..]) {
             Ok(m) => m,
@@ -238,7 +253,10 @@ impl Config {
                 Some(ref s) if s.eq_ignore_ascii_case("one") => RequiredAcks::One,
                 Some(ref s) if s.eq_ignore_ascii_case("all") => RequiredAcks::All,
                 Some(s) => {
-                    return Err(anyhow!("{:?}", format!("Unknown --required-acks argument: {}", s)))
+                    return Err(anyhow!(
+                        "{:?}",
+                        format!("Unknown --required-acks argument: {}", s)
+                    ))
                 }
             },
             batch_size: to_number(m.opt_str("batch-size"), 1)?,

examples/console-producer.rs

@@ -34,7 +34,13 @@ fn consume_messages(group: String, topic: String, brokers: Vec<String>) -> Resul
 
         for ms in mss.iter() {
             for m in ms.messages() {
-                println!("{}:{}@{}: {:?}", ms.topic(), ms.partition(), m.offset, m.value);
+                println!(
+                    "{}:{}@{}: {:?}",
+                    ms.topic(),
+                    ms.partition(),
+                    m.offset,
+                    m.value
+                );
             }
             let _ = con.consume_messageset(ms);
         }

examples/example-consume.rs

@@ -118,10 +118,20 @@ mod example {
         fn from_cmdline() -> Result<Config, String> {
             let mut opts = getopts::Options::new();
             opts.optflag("h", "help", "Print this help screen");
-            opts.optopt("", "brokers", "Specify kafka brokers (comma separated)", "HOSTS");
+            opts.optopt(
+                "",
+                "brokers",
+                "Specify kafka brokers (comma separated)",
+                "HOSTS",
+            );
             opts.optopt("", "ca-cert", "Specify the trusted CA certificates", "FILE");
             opts.optopt("", "client-cert", "Specify the client certificate", "FILE");
-            opts.optopt("", "client-key", "Specify key for the client certificate", "FILE");
+            opts.optopt(
+                "",
+                "client-key",
+                "Specify key for the client certificate",
+                "FILE",
+            );
             opts.optflag(
                 "",
                 "no-hostname-verification",

examples/example-ssl.rs

@@ -307,12 +307,26 @@ impl Config {
         let args: Vec<String> = env::args().collect();
         let mut opts = getopts::Options::new();
         opts.optflag("h", "help", "Print this help screen");
-        opts.optopt("", "brokers", "Specify kafka bootstrap brokers (comma separated)", "HOSTS");
+        opts.optopt(
+            "",
+            "brokers",
+            "Specify kafka bootstrap brokers (comma separated)",
+            "HOSTS",
+        );
         opts.optopt("", "topic", "Specify the topic to monitor", "TOPIC");
         opts.optopt("", "group", "Specify the group to monitor", "GROUP");
-        opts.optopt("", "storage", "Specify offset store [zookeeper, kafka]", "STORE");
+        opts.optopt(
+            "",
+            "storage",
+            "Specify offset store [zookeeper, kafka]",
+            "STORE",
+        );
         opts.optopt("", "sleep", "Specify the sleep time", "SECS");
-        opts.optflag("", "partitions", "Print each partition instead of the summary");
+        opts.optflag(
+            "",
+            "partitions",
+            "Print each partition instead of the summary",
+        );
         opts.optflag("", "no-growth", "Don't print offset growth");
         opts.optflag(
             "",
@@ -344,7 +358,12 @@ impl Config {
         if let Some(s) = m.opt_str("sleep") {
             match s.parse::<u64>() {
                 Ok(n) if n != 0 => period = Duration::from_secs(n),
-                _ => return Err(Error::from(anyhow!("not a number greater than zero: {}", s))),
+                _ => {
+                    return Err(Error::from(anyhow!(
+                        "not a number greater than zero: {}",
+                        s
+                    )))
+                }
             }
         }
         Ok(Config {

examples/offset-monitor.rs

@@ -127,7 +127,11 @@ fn dump_metadata(cfg: Config) -> Result<(), String> {
     // ~ print header line
     if cfg.header {
         use std::fmt::Write;
-        let _ = write!(out_buf, "{1:0$} {2:4} {3:4}", topic_width, "topic", "p-id", "l-id");
+        let _ = write!(
+            out_buf,
+            "{1:0$} {2:4} {3:4}",
+            topic_width, "topic", "p-id", "l-id"
+        );
         if cfg.host {
             let _ = write!(out_buf, " {1:>0$}", host_width, "(l-host)");
         }
@@ -170,8 +174,11 @@ fn dump_metadata(cfg: Config) -> Result<(), String> {
                         .leader()
                         .map(|b| (b.id(), b.host()))
                         .unwrap_or((-1, ""));
-                    let _ =
-                        write!(out_buf, "{1:0$} {2:>4} {3:>4}", topic_width, topic, pi, leader_id);
+                    let _ = write!(
+                        out_buf,
+                        "{1:0$} {2:>4} {3:>4}",
+                        topic_width, topic, pi, leader_id
+                    );
                     if cfg.host {
                         fmt_buf.clear();
                         let _ = write!(fmt_buf, "({})", leader_host);
@@ -212,7 +219,12 @@ impl Config {
         let mut opts = getopts::Options::new();
         opts.optflag("h", "help", "Print this help screen");
         opts.optflag("", "no-header", "Don't print headers");
-        opts.optopt("", "brokers", "Specify kafka brokers (comma separated)", "HOSTS");
+        opts.optopt(
+            "",
+            "brokers",
+            "Specify kafka brokers (comma separated)",
+            "HOSTS",
+        );
         opts.optopt("", "topics", "Specify topics (comma separated)", "NAMES");
         opts.optflag("", "no-host", "Don't print host:port of leaders");
         opts.optflag("", "no-size", "Don't print partition sizes");