Skip to content

Commit 0eaac42

Browse files
tshepangtshepang
committedAug 11, 2021
cargo fix --edition
1 parent ef2cd70 commit 0eaac42

19 files changed

+62
-62
lines changed
 

‎src/client/mod.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ use std::thread;
1414
use std::time::{Duration, Instant};
1515

1616
// pub re-export
17-
pub use compression::Compression;
18-
pub use utils::PartitionOffset;
17+
pub use crate::compression::Compression;
18+
pub use crate::utils::PartitionOffset;
1919

2020
#[cfg(feature = "security")]
2121
pub use self::network::SecurityConfig;
2222

23-
use codecs::{FromByte, ToByte};
24-
use error::{Error, ErrorKind, KafkaCode, Result};
25-
use protocol::{self, ResponseParser};
23+
use crate::codecs::{FromByte, ToByte};
24+
use crate::error::{Error, ErrorKind, KafkaCode, Result};
25+
use crate::protocol::{self, ResponseParser};
2626

27-
use client_internals::KafkaClientInternals;
27+
use crate::client_internals::KafkaClientInternals;
2828

2929
pub mod metadata;
3030
mod network;
@@ -35,7 +35,7 @@ mod state;
3535
pub mod fetch {
3636
//! A representation of fetched messages from Kafka.
3737
38-
pub use protocol::fetch::{Data, Message, Partition, Response, Topic};
38+
pub use crate::protocol::fetch::{Data, Message, Partition, Response, Topic};
3939
}
4040

4141
const DEFAULT_CONNECTION_RW_TIMEOUT_SECS: u64 = 120;

‎src/client/network.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::time::{Duration, Instant};
1414
#[cfg(feature = "security")]
1515
use openssl::ssl::SslConnector;
1616

17-
use error::Result;
17+
use crate::error::Result;
1818

1919
// --------------------------------------------------------------------
2020

‎src/client/state.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use std::convert::AsRef;
33
use std::slice;
44
use std::u32;
55

6-
use error::Result;
7-
use protocol;
6+
use crate::error::Result;
7+
use crate::protocol;
88

99
#[derive(Debug)]
1010
pub struct ClientState {
@@ -407,8 +407,8 @@ impl ClientState {
407407
#[cfg(test)]
408408
mod tests {
409409
use super::ClientState;
410-
use protocol;
411-
use protocol::metadata as md;
410+
use crate::protocol;
411+
use crate::protocol::metadata as md;
412412

413413
fn new_partition(id: i32, leader: i32) -> md::PartitionMetadata {
414414
md::PartitionMetadata {

‎src/client_internals.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! A crate private module to expose `KafkaClient` internals for use
22
//! within this crate but not outside of it.
33
4-
use client::ProduceMessage;
5-
use error::Result;
6-
use producer::ProduceConfirm;
4+
use crate::client::ProduceMessage;
5+
use crate::error::Result;
6+
use crate::producer::ProduceConfirm;
77

88
pub trait KafkaClientInternals {
99
fn internal_produce_messages<'a, 'b, I, J>(

‎src/codecs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::default::Default;
22
use std::io::{Read, Write};
33

44
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
5-
use error::{ErrorKind, Result};
5+
use crate::error::{ErrorKind, Result};
66

77
// Helper macro to safely convert an usize expression into a signed
88
// integer. If the conversion is not possible the macro issues a

‎src/compression/gzip.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use flate2::read::GzDecoder;
44
use flate2::write::GzEncoder;
55
use flate2::Compression;
66

7-
use error::Result;
7+
use crate::error::Result;
88

99
pub fn compress(src: &[u8]) -> Result<Vec<u8>> {
1010
let mut e = GzEncoder::new(Vec::new(), Compression::best());

‎src/compression/snappy.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::io::{self, Read};
33
use byteorder::{BigEndian, ByteOrder};
44
use snap;
55

6-
use error::{Error, ErrorKind, Result};
6+
use crate::error::{Error, ErrorKind, Result};
77

88
pub fn compress(src: &[u8]) -> Result<Vec<u8>> {
99
let mut buf = vec![0; snap::max_compress_len(src.len())];
@@ -205,7 +205,7 @@ mod tests {
205205
use std::str;
206206

207207
use super::{compress, uncompress_to, SnappyReader};
208-
use error::{Error, ErrorKind, Result};
208+
use crate::error::{Error, ErrorKind, Result};
209209

210210
fn uncompress(src: &[u8]) -> Result<Vec<u8>> {
211211
let mut v = Vec::new();

‎src/consumer/builder.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
use std::collections::HashMap;
22
use std::time::Duration;
33

4-
use client::{self, FetchOffset, GroupOffsetStorage, KafkaClient};
5-
use error::{ErrorKind, Result};
4+
use crate::client::{self, FetchOffset, GroupOffsetStorage, KafkaClient};
5+
use crate::error::{ErrorKind, Result};
66

77
use super::assignment;
88
use super::config::Config;
99
use super::state::State;
1010
use super::{Consumer, DEFAULT_FALLBACK_OFFSET, DEFAULT_RETRY_MAX_BYTES_LIMIT};
1111

1212
#[cfg(feature = "security")]
13-
use client::SecurityConfig;
13+
use crate::client::SecurityConfig;
1414

1515
#[cfg(not(feature = "security"))]
1616
type SecurityConfig = ();

‎src/consumer/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use client::FetchOffset;
1+
use crate::client::FetchOffset;
22

33
#[derive(Debug)]
44
pub struct Config {

‎src/consumer/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@
6464
use std::collections::hash_map::{Entry, HashMap};
6565
use std::slice;
6666

67-
use client::fetch;
68-
use client::{CommitOffset, FetchPartition, KafkaClient};
69-
use error::{ErrorKind, KafkaCode, Result};
67+
use crate::client::fetch;
68+
use crate::client::{CommitOffset, FetchPartition, KafkaClient};
69+
use crate::error::{ErrorKind, KafkaCode, Result};
7070

7171
// public re-exports
7272
pub use self::builder::Builder;
73-
pub use client::fetch::Message;
74-
pub use client::FetchOffset;
75-
pub use client::GroupOffsetStorage;
73+
pub use crate::client::fetch::Message;
74+
pub use crate::client::FetchOffset;
75+
pub use crate::client::GroupOffsetStorage;
7676

7777
mod assignment;
7878
mod builder;

‎src/consumer/state.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use std::hash::BuildHasherDefault;
55

66
use fnv::FnvHasher;
77

8-
use client::metadata::Topics;
9-
use client::{FetchGroupOffset, FetchOffset, KafkaClient};
10-
use error::{ErrorKind, KafkaCode, Result};
8+
use crate::client::metadata::Topics;
9+
use crate::client::{FetchGroupOffset, FetchOffset, KafkaClient};
10+
use crate::error::{ErrorKind, KafkaCode, Result};
1111

1212
use super::assignment::{Assignment, AssignmentRef, Assignments};
1313
use super::config::Config;

‎src/producer.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
// XXX 1) rethink return values for the send_all() method
6060
// XXX 2) Handle recoverable errors behind the scenes through retry attempts
6161

62-
use client::{self, KafkaClient};
63-
use error::{ErrorKind, Result};
62+
use crate::client::{self, KafkaClient};
63+
use crate::error::{ErrorKind, Result};
6464
use ref_slice::ref_slice;
6565
use std::collections::HashMap;
6666
use std::fmt;
@@ -69,15 +69,15 @@ use std::time::Duration;
6969
use twox_hash::XxHash32;
7070

7171
#[cfg(feature = "security")]
72-
use client::SecurityConfig;
72+
use crate::client::SecurityConfig;
7373

7474
#[cfg(not(feature = "security"))]
7575
type SecurityConfig = ();
76-
use client_internals::KafkaClientInternals;
77-
use protocol;
76+
use crate::client_internals::KafkaClientInternals;
77+
use crate::protocol;
7878

7979
// public re-exports
80-
pub use client::{Compression, ProduceConfirm, ProducePartitionConfirm, RequiredAcks};
80+
pub use crate::client::{Compression, ProduceConfirm, ProducePartitionConfirm, RequiredAcks};
8181

8282
/// The default value for `Builder::with_ack_timeout`.
8383
pub const DEFAULT_ACK_TIMEOUT_MILLIS: u64 = 30 * 1000;
@@ -677,7 +677,7 @@ mod default_partitioner_tests {
677677
use std::hash::{BuildHasherDefault, Hasher};
678678

679679
use super::{DefaultHasher, DefaultPartitioner, Partitioner, Partitions, Topics};
680-
use client;
680+
use crate::client;
681681

682682
fn topics_map(topics: Vec<(&str, Partitions)>) -> HashMap<String, Partitions> {
683683
let mut h = HashMap::new();

‎src/protocol/consumer.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::io::{Read, Write};
22

3-
use codecs::{self, FromByte, ToByte};
4-
use error::{self, Error, ErrorKind, KafkaCode, Result};
5-
use utils::PartitionOffset;
3+
use crate::codecs::{self, FromByte, ToByte};
4+
use crate::error::{self, Error, ErrorKind, KafkaCode, Result};
5+
use crate::utils::PartitionOffset;
66

77
use super::{HeaderRequest, HeaderResponse};
88
use super::{API_KEY_GROUP_COORDINATOR, API_KEY_OFFSET_COMMIT, API_KEY_OFFSET_FETCH, API_VERSION};

‎src/protocol/fetch.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ use std::mem;
88

99
use fnv::FnvHasher;
1010

11-
use codecs::ToByte;
11+
use crate::codecs::ToByte;
1212
#[cfg(feature = "gzip")]
13-
use compression::gzip;
13+
use crate::compression::gzip;
1414
#[cfg(feature = "snappy")]
15-
use compression::snappy::SnappyReader;
16-
use compression::Compression;
17-
use error::{Error, ErrorKind, KafkaCode, Result};
15+
use crate::compression::snappy::SnappyReader;
16+
use crate::compression::Compression;
17+
use crate::error::{Error, ErrorKind, KafkaCode, Result};
1818

1919
use super::to_crc;
2020
use super::zreader::ZReader;
@@ -487,7 +487,7 @@ mod tests {
487487
use std::str;
488488

489489
use super::{FetchRequest, Message, Response};
490-
use error::{Error, ErrorKind, KafkaCode};
490+
use crate::error::{Error, ErrorKind, KafkaCode};
491491

492492
static FETCH1_TXT: &str = include_str!("../../test-data/fetch1.txt");
493493

‎src/protocol/metadata.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::io::{Read, Write};
22

3-
use codecs::{AsStrings, FromByte, ToByte};
4-
use error::Result;
3+
use crate::codecs::{AsStrings, FromByte, ToByte};
4+
use crate::error::Result;
55

66
use super::{HeaderRequest, HeaderResponse};
77
use super::{API_KEY_METADATA, API_VERSION};

‎src/protocol/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use std::io::{Read, Write};
22
use std::mem;
33
use std::time::Duration;
44

5-
use codecs::{FromByte, ToByte};
5+
use crate::codecs::{FromByte, ToByte};
66
use crc::crc32;
7-
use error::{Error, ErrorKind, KafkaCode, Result};
7+
use crate::error::{Error, ErrorKind, KafkaCode, Result};
88

99
/// Macro to return Result<()> from multiple statements
1010
macro_rules! try_multi {

‎src/protocol/offset.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use std::io::{Read, Write};
22

33
use super::{HeaderRequest, HeaderResponse};
44
use super::{API_KEY_OFFSET, API_VERSION};
5-
use codecs::{FromByte, ToByte};
6-
use error::{KafkaCode, Result};
5+
use crate::codecs::{FromByte, ToByte};
6+
use crate::error::{KafkaCode, Result};
77
use std;
8-
use utils::PartitionOffset;
8+
use crate::utils::PartitionOffset;
99

1010
#[derive(Debug)]
1111
pub struct OffsetRequest<'a> {

‎src/protocol/produce.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
use std::io::{Read, Write};
22

3-
use codecs::{FromByte, ToByte};
3+
use crate::codecs::{FromByte, ToByte};
44
#[cfg(feature = "gzip")]
5-
use compression::gzip;
5+
use crate::compression::gzip;
66
#[cfg(feature = "snappy")]
7-
use compression::snappy;
8-
use compression::Compression;
7+
use crate::compression::snappy;
8+
use crate::compression::Compression;
99

10-
use error::{KafkaCode, Result};
10+
use crate::error::{KafkaCode, Result};
1111

1212
use super::to_crc;
1313
use super::{HeaderRequest, HeaderResponse};
1414
use super::{API_KEY_PRODUCE, API_VERSION};
15-
use producer::{ProduceConfirm, ProducePartitionConfirm};
15+
use crate::producer::{ProduceConfirm, ProducePartitionConfirm};
1616

1717
/// The magic byte (a.k.a version) we use for sent messages.
1818
const MESSAGE_MAGIC_BYTE: i8 = 0;

‎src/protocol/zreader.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::str;
22

33
use byteorder::{BigEndian, ByteOrder};
4-
use error::{ErrorKind, Result};
4+
use crate::error::{ErrorKind, Result};
55

66
static EMPTY_STR: &str = "";
77

0 commit comments

Comments
 (0)
Please sign in to comment.