mirror of
https://github.com/asciinema/asciinema.git
synced 2025-12-16 03:38:03 +01:00
Remove unnecessary Result wrapper
This commit is contained in:
@@ -19,13 +19,12 @@ struct EventSerializer(u64);
|
|||||||
|
|
||||||
pub async fn stream<S: Stream<Item = Result<Event, BroadcastStreamRecvError>>>(
|
pub async fn stream<S: Stream<Item = Result<Event, BroadcastStreamRecvError>>>(
|
||||||
stream: S,
|
stream: S,
|
||||||
) -> Result<impl Stream<Item = Result<Vec<u8>, BroadcastStreamRecvError>>> {
|
) -> impl Stream<Item = Result<Vec<u8>, BroadcastStreamRecvError>> {
|
||||||
let header = stream::once(future::ready(Ok(MAGIC_STRING.into())));
|
let header = stream::once(future::ready(Ok(MAGIC_STRING.into())));
|
||||||
let mut serializer = EventSerializer(0);
|
let mut serializer = EventSerializer(0);
|
||||||
|
|
||||||
let events = stream.map(move |event| event.map(|event| serializer.serialize_event(event)));
|
let events = stream.map(move |event| event.map(|event| serializer.serialize_event(event)));
|
||||||
|
|
||||||
Ok(header.chain(events))
|
header.chain(events)
|
||||||
}
|
}
|
||||||
|
|
||||||
impl EventSerializer {
|
impl EventSerializer {
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ async fn event_stream(
|
|||||||
let stream = subscriber.subscribe().await?;
|
let stream = subscriber.subscribe().await?;
|
||||||
|
|
||||||
let stream = alis::stream(stream)
|
let stream = alis::stream(stream)
|
||||||
.await?
|
.await
|
||||||
.map(ws_result)
|
.map(ws_result)
|
||||||
.chain(futures_util::stream::once(future::ready(Ok(
|
.chain(futures_util::stream::once(future::ready(Ok(
|
||||||
close_message(),
|
close_message(),
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ async fn handle_socket(socket: WebSocket, subscriber: Subscriber) -> anyhow::Res
|
|||||||
let stream = subscriber.subscribe().await?;
|
let stream = subscriber.subscribe().await?;
|
||||||
|
|
||||||
let result = alis::stream(stream)
|
let result = alis::stream(stream)
|
||||||
.await?
|
.await
|
||||||
.map(ws_result)
|
.map(ws_result)
|
||||||
.chain(futures_util::stream::once(future::ready(Ok(close_msg))))
|
.chain(futures_util::stream::once(future::ready(Ok(close_msg))))
|
||||||
.forward(sink)
|
.forward(sink)
|
||||||
|
|||||||
Reference in New Issue
Block a user