adjust to bitbuffer rename

Cargo.lock

@@ -61,22 +61,17 @@ dependencies = [
 ]
 
 [[package]]
-name = "bitflags"
+name = "bitbuffer"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bitstream_reader"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitstream_reader_derive 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitbuffer_derive 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "bitstream_reader_derive"
+name = "bitbuffer_derive"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
@@ -86,6 +81,11 @@ dependencies = [
  "syn_util 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "1.3.2"
@@ -577,7 +577,7 @@ name = "tf-demo-parser"
 version = "0.1.0"
 dependencies = [
  "better-panic 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitstream_reader 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitbuffer 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "enumflags2 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "err-derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -651,9 +651,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
 "checksum better-panic 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64714970eb2081691f85a923b78a490fd7c3e256dcc83c7a5177314586563356"
+"checksum bitbuffer 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6007718437539bc4564d96742ad7a86adf1244b5fb6e0381b426034f957edb7f"
+"checksum bitbuffer_derive 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d481746ea558a93cdbd62cd9766ab7f56789dcb2605b8344727c5ee92007070"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum bitstream_reader 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a9de2c46b1cdc782cebc62826a4ce5b7b249dea2a8364a843dc8ae74ee28b77"
-"checksum bitstream_reader_derive 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "179ff2924e697e85c8fd462b4545327c3a482c6f4da66dd4b0e4652d1969b480"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"

Cargo.toml

@@ -13,7 +13,7 @@ name = "parse_demo"
 path = "src/bin/main.rs"
 
 [dependencies]
-bitstream_reader = "0.7.1"
+bitbuffer = "0.7.1"
 num_enum = "0.4"
 num-traits = "0.2"
 enumflags2 = "0.6"

src/demo/gamevent.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::BitRead;
+use bitbuffer::BitRead;
 
 use crate::{ParseError, Result};
 

src/demo/header.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::BitRead;
+use bitbuffer::BitRead;
 
 #[derive(BitRead, Debug, PartialEq)]
 pub struct Header {

src/demo/message/bspdecal.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 
 use crate::demo::sendprop::read_bit_coord;
 use crate::demo::vector::Vector;

src/demo/message/classinfo.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
+use bitbuffer::{BitRead, BitReadSized, LittleEndian};
 
 use crate::demo::message::stringtable::log_base2;
 use crate::{ReadResult, Stream};

src/demo/message/gameevent.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::iter::FromIterator;
 
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 use parse_display::Display;
 
 use crate::demo::gameevent_gen::GameEventType;

src/demo/message/generated.rs

@@ -1,6 +1,6 @@
 use crate::Stream;
 /// Messages that consists only of primitives and string and can be derived
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 use std::collections::HashMap;
 
 #[derive(BitRead, Debug)]

src/demo/message/packetentities.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
+use bitbuffer::{BitRead, BitReadSized, LittleEndian};
 use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 

src/demo/message/setconvar.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, BitReadSized, LittleEndian};
+use bitbuffer::{BitRead, BitReadSized, LittleEndian};
 
 use crate::demo::message::stringtable::log_base2;
 use crate::{ReadResult, Stream};

src/demo/message/stringtable.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitBuffer, BitStream, LittleEndian};
+use bitbuffer::{BitReadBuffer, BitReadStream, LittleEndian};
 use num_traits::{PrimInt, Unsigned};
 use snap::Decoder;
 
@@ -67,8 +67,8 @@ impl Parse for CreateStringTableMessage {
                 });
             }
 
-            let buffer = BitBuffer::new(decompressed_data, LittleEndian);
+            let buffer = BitReadBuffer::new(decompressed_data, LittleEndian);
-            table_data = BitStream::new(buffer);
+            table_data = BitReadStream::new(buffer);
         }
 
         let table_meta = StringTableMeta {

src/demo/message/usermessage.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, LittleEndian, ReadError};
+use bitbuffer::{BitRead, LittleEndian, ReadError};
 use num_enum::TryFromPrimitive;
 use serde::{Deserialize, Serialize};
 use std::convert::TryFrom;

src/demo/message/voice.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 
 use crate::{ReadResult, Stream};
 

src/demo/mod.rs

@@ -1,5 +1,5 @@
 use crate::ReadResult;
-use bitstream_reader::{BitBuffer, BitStream, LittleEndian, ReadError};
+use bitbuffer::{BitReadBuffer, BitReadStream, LittleEndian, ReadError};
 
 pub mod gameevent_gen;
 pub mod gamevent;
@@ -10,8 +10,8 @@ pub mod parser;
 pub mod sendprop;
 pub mod vector;
 
-pub type Buffer = BitBuffer<LittleEndian>;
+pub type Buffer = BitReadBuffer<LittleEndian>;
-pub type Stream = BitStream<LittleEndian>;
+pub type Stream = BitReadStream<LittleEndian>;
 
 pub struct Demo {
     stream: Stream,

src/demo/packet/consolecmd.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 
 use crate::{ReadResult, Stream};
 

src/demo/packet/datatable.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 
 use crate::demo::parser::MalformedSendPropDefinitionError;
 use crate::demo::sendprop::{

src/demo/packet/message.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{bit_size_of, BitRead, Endianness, LazyBitRead, LittleEndian};
+use bitbuffer::{bit_size_of, BitRead, Endianness, LazyBitRead, LittleEndian};
 
 use crate::demo::message::{Message, MessageType};
 use crate::demo::vector::Vector;
@@ -27,7 +27,7 @@ pub struct ViewAngles {
 }
 
 impl<E: Endianness> BitRead<E> for ViewAngles {
-    fn read(stream: &mut bitstream_reader::BitStream<E>) -> ReadResult<Self> {
+    fn read(stream: &mut bitbuffer::BitReadStream<E>) -> ReadResult<Self> {
         let view_origin_1 = Vector::read(stream)?;
         let view_angle_1 = Vector::read(stream)?;
         let local_view_angle_1 = Vector::read(stream)?;

src/demo/packet/mod.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::BitRead;
+use bitbuffer::BitRead;
 use num_enum::TryFromPrimitive;
 use std::convert::TryFrom;
 

src/demo/packet/stop.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 
 use crate::{ReadResult, Stream};
 

src/demo/packet/stringtable.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 
 use crate::demo::message::stringtable::StringTableMeta;
 use crate::{Parse, ParseError, ParserState, ReadResult, Result, Stream};

src/demo/packet/synctick.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::BitRead;
+use bitbuffer::BitRead;
 
 #[derive(BitRead, Debug)]
 pub struct SyncTickPacket {

src/demo/packet/usercmd.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 
 use crate::{ReadResult, Stream};
 

src/demo/parser/error.rs

@@ -2,7 +2,7 @@ use crate::demo::gamevent::GameEventValueType;
 use crate::demo::message::gameevent::GameEventTypeId;
 use crate::demo::message::packetentities::EntityId;
 use crate::demo::packet::datatable::{ClassId, SendTableName};
-use bitstream_reader::{FromUtf8Error, ReadError};
+use bitbuffer::{FromUtf8Error, ReadError};
 use err_derive::Error;
 
 /// Errors that can occur during parsing

src/demo/parser/mod.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, FromUtf8Error, LittleEndian, ReadError};
+use bitbuffer::{BitRead, FromUtf8Error, LittleEndian, ReadError};
 
 pub use self::messagetypeanalyser::MessageTypeAnalyser;
 use crate::demo::gamevent::{GameEventValue, GameEventValueType};

src/demo/sendprop.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, LittleEndian};
 use enumflags2::BitFlags;
 use serde::{Deserialize, Serialize};
 

src/demo/vector.rs

@@ -1,4 +1,4 @@
-use bitstream_reader::BitRead;
+use bitbuffer::BitRead;
 use parse_display::Display;
 use serde::{Deserialize, Serialize};
 

src/lib.rs

@@ -2,7 +2,7 @@
 #![allow(unused_imports)]
 #![allow(unused_variables)]
 
-pub use bitstream_reader::Result as ReadResult;
+pub use bitbuffer::Result as ReadResult;
 
 pub use crate::demo::{
     message::MessageType,