Skip to content

Commit f24e2ac

Browse files
committed
compile fixes with all features
1 parent 9b070c7 commit f24e2ac

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

cli/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub async fn create_context(
6666
reader,
6767
writer,
6868
rpc_twoparty_capnp::Side::Client,
69-
*distill_schema::default_capnp_reader_options(),
69+
distill_schema::default_capnp_reader_options(),
7070
));
7171

7272
let mut rpc_system = RpcSystem::new(rpc_network, None);

importer/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ pub trait AsyncImporter: Send + 'static {
137137
/// by storing generated AssetUuids with mappings to format-internal identifiers.
138138
type State: Serialize + Send + 'static;
139139

140-
fn default_options<'a>(&'a self, _import_source: ImportSource<'_>) -> Option<Self::Options>;
140+
fn default_options<'a>(&'a self, _import_source: ImportSource<'_>) -> Option<Self::Options> {
141+
None
142+
}
141143

142144
/// Reads the given bytes and produces assets.
143145
fn import<'a>(

src/lib.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ mod tests {
7171
AsyncImporter, ImportOp, ImportedAsset, ImporterValue, Result as ImportResult,
7272
};
7373
use distill_loader::{
74-
rpc_io::RpcIO,
74+
rpc_io::{RpcConnectionType, RpcIO},
7575
storage::{
7676
AssetLoadOp, AssetStorage, DefaultIndirectionResolver, LoadStatus, LoaderInfoProvider,
7777
},
@@ -255,7 +255,9 @@ mod tests {
255255

256256
let (daemon_handle, tx) = spawn_daemon(&daemon_address);
257257

258-
let mut loader = Loader::new(Box::new(RpcIO::new(daemon_address).unwrap()));
258+
let mut loader = Loader::new(Box::new(
259+
RpcIO::new(RpcConnectionType::TCP(daemon_address)).unwrap(),
260+
));
259261
let handle = loader.add_ref(
260262
// asset uuid of "tests/assets/asset.txt"
261263
"b24d209d-6622-4d78-a983-731e8b76f04d",
@@ -295,7 +297,9 @@ mod tests {
295297

296298
let (daemon_handle, tx) = spawn_daemon(&daemon_address);
297299

298-
let mut loader = Loader::new(Box::new(RpcIO::new(daemon_address).unwrap()));
300+
let mut loader = Loader::new(Box::new(
301+
RpcIO::new(RpcConnectionType::TCP(daemon_address)).unwrap(),
302+
));
299303
let handle = loader.add_ref(
300304
// asset uuid of "tests/assets/asset_a.txt"
301305
"d83bb247-2710-4c10-83df-d7daa53e19bf",

0 commit comments

Comments
 (0)