Skip to content

Commit e328931

Browse files
committed
clippy fixes
1 parent 69686c2 commit e328931

File tree

5 files changed

+32
-38
lines changed

5 files changed

+32
-38
lines changed

fixtures/hello_world/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,3 @@ pub fn hello(input: String) -> String {
8080
}
8181

8282
uniffi::include_scaffolding!("api");
83-
84-
mod uniffi_types {
85-
pub use crate::{World, WorldState};
86-
}

fixtures/streams_ext/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use async_stream::stream;
22
use futures::stream::{self, Stream, StreamExt};
33
use std::pin::Pin;
44
use tokio::time::{interval, Duration};
5-
use uniffi_dart::*;
65

76
#[uniffi_dart::export_stream(i32)]
87
pub fn simple_stream() -> impl Stream<Item = i32> {

src/gen/objects.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::gen::oracle::{AsCodeType, DartCodeOracle};
66
use crate::gen::render::AsRenderable;
77
use crate::gen::render::{Renderable, TypeHelperRenderer};
88

9-
use super::stream::stream::generate_stream;
9+
use super::stream::generate_stream;
1010

1111
#[derive(Debug)]
1212
pub struct ObjectCodeType {

src/gen/stream/mod.rs

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,31 @@
1-
pub mod stream;
1+
use genco::prelude::*;
2+
use uniffi_bindgen::interface::Object;
3+
4+
use crate::gen::oracle::DartCodeOracle;
5+
use crate::gen::render::TypeHelperRenderer;
6+
7+
pub fn generate_stream(obj: &Object, _type_helper: &dyn TypeHelperRenderer) -> dart::Tokens {
8+
let obj_name = obj.name();
9+
let fn_name = DartCodeOracle::fn_name(&obj_name.replace("StreamExt", ""));
10+
let obj_var_name = &DartCodeOracle::var_name(&fn_name);
11+
let create_obj_fn_name = format!("createStream{}", &obj_name.replace("StreamExt", ""));
12+
13+
quote! {
14+
$fn_name() async* {
15+
final $obj_var_name = $create_obj_fn_name();
16+
try {
17+
while (true) {
18+
final value = await $obj_var_name.next();
19+
if (value == null) {
20+
break;
21+
}
22+
yield value;
23+
}
24+
} catch (e) {
25+
// Handle exceptions if necessary
26+
rethrow;
27+
}
28+
// No need to call drop(), Finalizer will handle it
29+
}
30+
}
31+
}

src/gen/stream/stream.rs

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)