Skip to content

Commit 852b0c2

Browse files
authored
Split archive file (#126)
Signed-off-by: Christian Vetter <[email protected]>
1 parent 9671800 commit 852b0c2

File tree

9 files changed

+471
-452
lines changed

9 files changed

+471
-452
lines changed

flatdata-rs/lib/src/archive.rs

Lines changed: 1 addition & 445 deletions
Large diffs are not rendered by default.

flatdata-rs/lib/src/arrayview.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::archive::{RefFactory, Struct};
1+
use crate::structs::{RefFactory, Struct};
22
use crate::vector::Vector;
33

44
use std::fmt;
@@ -236,8 +236,8 @@ where
236236
#[allow(dead_code)]
237237
mod test {
238238
use super::*;
239-
use crate::archive::Struct;
240239
use crate::memory;
240+
use crate::structs::Struct;
241241

242242
define_struct!(
243243
Value,

flatdata-rs/lib/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ mod bytereader;
273273
#[macro_use]
274274
mod bytewriter;
275275
#[macro_use]
276+
mod structs;
277+
#[macro_use]
276278
mod archive;
277279
mod arrayview;
278280
mod error;
@@ -299,4 +301,5 @@ pub use crate::storage::{
299301
create_archive, create_external_vector, create_multi_vector, MemoryDescriptor, ResourceStorage,
300302
};
301303
pub use crate::structbuf::StructBuf;
304+
pub use crate::structs::*;
302305
pub use crate::vector::*;

flatdata-rs/lib/src/multiarrayview.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::archive::{IndexStruct, VariadicRef, VariadicRefFactory, VariadicStruct};
21
use crate::arrayview::ArrayView;
2+
use crate::structs::{IndexStruct, VariadicRef, VariadicRefFactory, VariadicStruct};
33

44
use std::fmt;
55
use std::iter;

flatdata-rs/lib/src/multivector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use crate::archive::{IndexStruct, VariadicRef, VariadicRefFactory, VariadicStruct};
21
use crate::error::ResourceStorageError;
32
use crate::memory;
43
use crate::multiarrayview::MultiArrayView;
54
use crate::storage::ResourceHandle;
5+
use crate::structs::{IndexStruct, VariadicRef, VariadicRefFactory, VariadicStruct};
66
use crate::vector::ExternalVector;
77

88
use std::borrow::BorrowMut;

flatdata-rs/lib/src/storage.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
use crate::archive::{ArchiveBuilder, Struct, VariadicRefFactory};
1+
use crate::archive::ArchiveBuilder;
22
use crate::error::ResourceStorageError;
33
use crate::memory::{SizeType, PADDING_SIZE};
44
use crate::multivector::MultiVector;
5+
use crate::structs::{Struct, VariadicRefFactory};
56
use crate::vector::ExternalVector;
67

78
use std::cell::RefCell;

flatdata-rs/lib/src/structbuf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Note: This module is called `structbuf` in contrast to `struct` in the C++
22
// implementation, since Rust does not allow module names to be one of the
33
// language keywords.
4-
use crate::archive::Struct;
54
use crate::memory;
5+
use crate::structs::Struct;
66

77
use std::fmt;
88
use std::marker;

0 commit comments

Comments
 (0)