rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make 'ws::Stream![]' mean 'ws::Stream!['static]'. 

This is in line with the stream macros in Rocket core.
This commit is contained in:
Sergio Benitez 2023-03-31 08:34:45 -07:00
parent 1d2cc257dc
commit 847e87d5c9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/upgrade/src/main.rs
View File

@ -17,7 +17,7 @@ fn echo_manual<'r>(ws: ws::WebSocket) -> ws::Channel<'r> {
} }
#[get("/echo")] #[get("/echo")]
fn echo_stream<'r>(ws: ws::WebSocket) -> ws::Stream!['r] { fn echo_stream(ws: ws::WebSocket) -> ws::Stream!['static] {
ws::stream! { ws => ws::stream! { ws =>
for await message in ws { for await message in ws {
yield message?; yield message?;

3
examples/upgrade/src/ws.rs
View File

@ -132,11 +132,12 @@ impl<'r, S> IoHandler for MessageStream<'r, S>
#[macro_export] #[macro_export]
macro_rules! Stream { macro_rules! Stream {
() => (Stream!['static]);
($l:lifetime) => ( ($l:lifetime) => (
$crate::ws::MessageStream<$l, impl rocket::futures::Stream< $crate::ws::MessageStream<$l, impl rocket::futures::Stream<
Item = $crate::ws::Result<$crate::ws::Message> Item = $crate::ws::Result<$crate::ws::Message>
> + $l> > + $l>
) );
} }
#[macro_export] #[macro_export]