Skip to content

Commit 276414c

Browse files
committed
fix merge problem
1 parent d547c9e commit 276414c

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

async-openai-wasm/src/types/impls.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -624,12 +624,6 @@ impl From<String> for ChatCompletionRequestDeveloperMessage {
624624
}
625625
}
626626

627-
impl From<String> for ChatCompletionRequestDeveloperMessage {
628-
fn from(value: String) -> Self {
629-
value.as_str().into()
630-
}
631-
}
632-
633627
impl From<&str> for ChatCompletionRequestAssistantMessage {
634628
fn from(value: &str) -> Self {
635629
ChatCompletionRequestAssistantMessageContent::Text(value.into()).into()

async-openai-wasm/src/types/realtime/client_event.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@ impl From<&ClientEvent> for String {
146146
}
147147
}
148148

149-
impl From<ClientEvent> for Message {
150-
fn from(value: ClientEvent) -> Self {
151-
Message::Text(String::from(&value).into())
152-
}
153-
}
154-
155149
macro_rules! event_struct_to_variant {
156150
($from_typ:ty, $evt_typ:ty, $variant:ident) => {
157151
impl From<$from_typ> for $evt_typ {

examples/realtime/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ async fn read_stdin(tx: futures_channel::mpsc::UnboundedSender<Message>) {
138138
// Create event of type "conversation.item.create"
139139
let event: ConversationItemCreateEvent = item.into();
140140
// Create WebSocket message from client event
141-
let message: Message = Message::Text(event.to_text());
141+
let message: Message = Message::Text(event.to_text().into());
142142
// send WebSocket message containing event of type "conversation.item.create" to server
143143
tx.unbounded_send(message).unwrap();
144144
// send WebSocket message containing event of type "response.create" to server
145-
tx.unbounded_send(Message::Text(ResponseCreateEvent::default().to_text()))
145+
tx.unbounded_send(Message::Text(ResponseCreateEvent::default().to_text().into()))
146146
.unwrap();
147147
}
148148
}

0 commit comments

Comments
 (0)