Skip to content

Commit

Permalink
Convert to Rust 2018 edition
Browse files Browse the repository at this point in the history
Running `cargo fix --edition`
  • Loading branch information
flavray committed Dec 16, 2018
1 parent 37ea688 commit 35d2108
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions src/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use byteorder;
#[cfg(feature = "snappy")]
use crc;

use types::{ToAvro, Value};
use util::DecodeError;
use crate::types::{ToAvro, Value};
use crate::util::DecodeError;

/// The compression codec used to compress blocks.
#[derive(Clone, Copy, Debug, PartialEq)]
Expand Down
2 changes: 1 addition & 1 deletion src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::slice::Iter;

use serde::de::{self, Deserialize, DeserializeSeed, Error as SerdeError, Visitor};

use types::Value;
use crate::types::Value;

#[derive(Clone, Debug, PartialEq)]
pub struct Error {
Expand Down
6 changes: 3 additions & 3 deletions src/decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use std::mem::transmute;

use failure::Error;

use schema::Schema;
use types::Value;
use util::{safe_len, zag_i32, zag_i64, DecodeError};
use crate::schema::Schema;
use crate::types::Value;
use crate::util::{safe_len, zag_i32, zag_i64, DecodeError};

#[inline]
fn decode_long<R: Read>(reader: &mut R) -> Result<Value, Error> {
Expand Down
6 changes: 3 additions & 3 deletions src/encode.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::mem::transmute;

use schema::Schema;
use types::Value;
use util::{zig_i32, zig_i64};
use crate::schema::Schema;
use crate::types::Value;
use crate::util::{zig_i32, zig_i64};

/// Encode a `Value` into avro format.
///
Expand Down
22 changes: 11 additions & 11 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -524,21 +524,21 @@ mod writer;
pub mod schema;
pub mod types;

pub use codec::Codec;
pub use de::from_value;
pub use reader::{from_avro_datum, Reader};
pub use schema::{ParseSchemaError, Schema};
pub use ser::to_value;
pub use types::SchemaResolutionError;
pub use util::{max_allocation_bytes, DecodeError};
pub use writer::{to_avro_datum, ValidationError, Writer};
pub use crate::codec::Codec;
pub use crate::de::from_value;
pub use crate::reader::{from_avro_datum, Reader};
pub use crate::schema::{ParseSchemaError, Schema};
pub use crate::ser::to_value;
pub use crate::types::SchemaResolutionError;
pub use crate::util::{max_allocation_bytes, DecodeError};
pub use crate::writer::{to_avro_datum, ValidationError, Writer};

#[cfg(test)]
mod tests {
use super::*;
use reader::Reader;
use schema::Schema;
use types::{Record, Value};
use crate::reader::Reader;
use crate::schema::Schema;
use crate::types::{Record, Value};

//TODO: move where it fits better
#[test]
Expand Down
16 changes: 8 additions & 8 deletions src/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ use std::str::{from_utf8, FromStr};
use failure::Error;
use serde_json::from_slice;

use decode::decode;
use schema::ParseSchemaError;
use schema::Schema;
use types::Value;
use util::{self, DecodeError};
use Codec;
use crate::decode::decode;
use crate::schema::ParseSchemaError;
use crate::schema::Schema;
use crate::types::Value;
use crate::util::{self, DecodeError};
use crate::Codec;

// Internal Block reader.
#[derive(Debug, Clone)]
Expand Down Expand Up @@ -288,8 +288,8 @@ pub fn from_avro_datum<R: Read>(
mod tests {
use super::*;
use std::io::Cursor;
use types::{Record, ToAvro};
use Reader;
use crate::types::{Record, ToAvro};
use crate::Reader;

static SCHEMA: &'static str = r#"
{
Expand Down
6 changes: 3 additions & 3 deletions src/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use failure::Error;
use serde::ser::{Serialize, SerializeMap, SerializeSeq, Serializer};
use serde_json::{self, Map, Value};

use types;
use util::MapHelper;
use crate::types;
use crate::util::MapHelper;

/// Describes errors happened while parsing Avro schemas.
#[derive(Fail, Debug)]
Expand Down Expand Up @@ -334,7 +334,7 @@ impl UnionSchema {

/// Optionally returns a reference to the schema matched by this value, as well as its position
/// within this enum.
pub fn find_schema(&self, value: &::types::Value) -> Option<(usize, &Schema)> {
pub fn find_schema(&self, value: &crate::types::Value) -> Option<(usize, &Schema)> {
let kind = SchemaKind::from(value);
self.variant_index
.get(&kind)
Expand Down
2 changes: 1 addition & 1 deletion src/ser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::iter::once;

use serde::ser::{self, Error as SerdeError, Serialize};

use types::{ToAvro, Value};
use crate::types::{ToAvro, Value};

#[derive(Clone, Default)]
pub struct Serializer {}
Expand Down
4 changes: 2 additions & 2 deletions src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::hash::BuildHasher;
use failure::Error;
use serde_json::Value as JsonValue;

use schema::{RecordField, Schema, SchemaKind, UnionSchema};
use crate::schema::{RecordField, Schema, SchemaKind, UnionSchema};

/// Describes errors happened while performing schema resolution on Avro data.
#[derive(Fail, Debug)]
Expand Down Expand Up @@ -540,7 +540,7 @@ impl Value {
#[cfg(test)]
mod tests {
use super::*;
use schema::{Name, RecordField, RecordFieldOrder, UnionSchema};
use crate::schema::{Name, RecordField, RecordFieldOrder, UnionSchema};

#[test]
fn validate() {
Expand Down
14 changes: 7 additions & 7 deletions src/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ use rand::random;
use serde::Serialize;
use serde_json;

use encode::{encode, encode_ref, encode_to_vec};
use schema::Schema;
use ser::Serializer;
use types::{ToAvro, Value};
use Codec;
use crate::encode::{encode, encode_ref, encode_to_vec};
use crate::schema::Schema;
use crate::ser::Serializer;
use crate::types::{ToAvro, Value};
use crate::Codec;

const SYNC_SIZE: usize = 16;
const SYNC_INTERVAL: usize = 1000 * SYNC_SIZE; // TODO: parametrize in Writer
Expand Down Expand Up @@ -347,8 +347,8 @@ pub fn to_avro_datum<T: ToAvro>(schema: &Schema, value: T) -> Result<Vec<u8>, Er
#[cfg(test)]
mod tests {
use super::*;
use types::Record;
use util::zig_i64;
use crate::types::Record;
use crate::util::zig_i64;

static SCHEMA: &'static str = r#"
{
Expand Down

0 comments on commit 35d2108

Please sign in to comment.