From 1fc7b5b404068c3d057a8f0c4de4e76580f86766 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Thu, 3 Nov 2022 17:48:44 +0100
Subject: [PATCH] Tweaks

---
 implementations/rust/oo/src/lib.rs    | 5 ++++-
 implementations/rust/oo/src/reader.rs | 3 ---
 implementations/rust/oo/src/repr.rs   | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/implementations/rust/oo/src/lib.rs b/implementations/rust/oo/src/lib.rs
index 767c6d1..cf92e13 100644
--- a/implementations/rust/oo/src/lib.rs
+++ b/implementations/rust/oo/src/lib.rs
@@ -9,7 +9,7 @@ pub mod source;
 pub mod types;
 pub mod writer;
 
-pub use domain::Domain;
+pub use domain::*;
 pub use reader::Reader;
 pub use repr::Annotations;
 pub use repr::Atom;
@@ -25,6 +25,9 @@ pub use repr::Value;
 pub use repr::owned;
 pub use repr::value;
 pub use signed_integer::SignedInteger;
+pub use source::BinarySource;
+pub use source::BytesBinarySource;
+pub use source::IOBinarySource;
 pub use types::AtomClass;
 pub use types::CompoundClass;
 pub use types::ValueClass;
diff --git a/implementations/rust/oo/src/reader.rs b/implementations/rust/oo/src/reader.rs
index a142f51..6648506 100644
--- a/implementations/rust/oo/src/reader.rs
+++ b/implementations/rust/oo/src/reader.rs
@@ -1,7 +1,6 @@
 use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::io;
-use std::marker::PhantomData;
 
 use crate::CompoundClass;
 use crate::SignedInteger;
@@ -287,7 +286,6 @@ pub trait Reader<'de> {
 pub struct IOValues<'de, R: Reader<'de>> {
     pub reader: R,
     pub read_annotations: bool,
-    phantom: PhantomData<&'de ()>,
 }
 
 impl<'de, R: Reader<'de>> IOValues<'de, R> {
@@ -295,7 +293,6 @@ impl<'de, R: Reader<'de>> IOValues<'de, R> {
         IOValues {
             reader,
             read_annotations: false,
-            phantom: PhantomData,
         }
     }
 
diff --git a/implementations/rust/oo/src/repr.rs b/implementations/rust/oo/src/repr.rs
index a3b17be..aaeb4c9 100644
--- a/implementations/rust/oo/src/repr.rs
+++ b/implementations/rust/oo/src/repr.rs
@@ -491,6 +491,10 @@ impl<V> Record<V> {
         if v.is_empty() { panic!("Internal error: empty vec supplied to Record::_from_vec") }
         Record(v)
     }
+
+    pub fn _vec(&self) -> &Vec<V> {
+        &self.0
+    }
 }
 
 impl<D: Domain, V: Value<D>> Value<D> for Record<V> {