Skip to content

Commit 14500db

Browse files
Take &str data argument in send() (#1)
1 parent 14fae1b commit 14500db

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ jobs:
3232
uses: actions-rs/cargo@v1
3333
with:
3434
command: check
35-
args: --all --bins --examples --features hyperium_http
35+
args: --all --bins --examples
3636

3737
- name: check unstable
3838
uses: actions-rs/cargo@v1
3939
with:
4040
command: check
41-
args: --all --benches --bins --examples --tests --features hyperium_http
41+
args: --all --benches --bins --examples --tests
4242

4343
- name: tests
4444
uses: actions-rs/cargo@v1

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@ pin-project-lite = "0.1.4"
2626
[dev-dependencies]
2727
femme = "1.3.0"
2828
async-std = { version = "1.5.0", features = ["attributes", "unstable"] }
29-
30-
[patch.crates-io]
31-
async-std = { path = "../async-std" }

src/encoder.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ pub fn encode() -> (Sender, Encoder) {
9595

9696
impl Sender {
9797
/// Send a new message over SSE.
98-
pub async fn send(&self, name: &str, data: &[u8], id: Option<&str>) {
98+
pub async fn send(&self, name: &str, data: &str, id: Option<&str>) {
9999
// Write the event name
100100
let msg = format!("event:{}\n", name);
101101
self.0.send(msg.into_bytes()).await;
@@ -106,10 +106,8 @@ impl Sender {
106106
}
107107

108108
// Write the data section, and end.
109-
let mut msg = b"data:".to_vec();
110-
msg.extend_from_slice(data);
111-
msg.extend_from_slice(b"\n\n");
112-
self.0.send(msg).await;
109+
let msg = format!("data:{}\n\n", data);
110+
self.0.send(msg.into_bytes()).await;
113111
}
114112

115113
/// Send a new "retry" message over SSE.

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//! // Create an encoder + sender pair and send a message.
1414
//! let (sender, encoder) = encode();
1515
//! task::spawn(async move {
16-
//! sender.send("cat", b"chashu", None).await;
16+
//! sender.send("cat", "chashu", None).await;
1717
//! });
1818
//!
1919
//! // Decode messages using a decoder.

tests/encode.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn assert_retry(event: &Event, dur: u64) {
3030
async fn encode_message() -> http_types::Result<()> {
3131
let (sender, encoder) = encode();
3232
task::spawn(async move {
33-
sender.send("cat", b"chashu", None).await;
33+
sender.send("cat", "chashu", None).await;
3434
});
3535

3636
let mut reader = decode(BufReader::new(encoder));
@@ -43,7 +43,7 @@ async fn encode_message() -> http_types::Result<()> {
4343
async fn encode_message_with_id() -> http_types::Result<()> {
4444
let (sender, encoder) = encode();
4545
task::spawn(async move {
46-
sender.send("cat", b"chashu", Some("0")).await;
46+
sender.send("cat", "chashu", Some("0")).await;
4747
});
4848

4949
let mut reader = decode(BufReader::new(encoder));

0 commit comments

Comments
 (0)