소스 검색

Remove dead code

Lee Morgan 3 주 전
부모
커밋
7378132d2b
3개의 변경된 파일12개의 추가작업 그리고 31개의 파일을 삭제
  1. 5 13
      src/controllers/game/session/create.rs
  2. 5 11
      src/controllers/game/session/turn/create.rs
  3. 2 7
      src/logic/prompt.rs

+ 5 - 13
src/controllers/game/session/create.rs

@@ -1,7 +1,6 @@
-use actix_web::{HttpResponse, HttpRequest, Responder, web, post};
+use actix_web::{HttpRequest, Responder, web, post};
 use sqlx::PgPool;
 use uuid::Uuid;
-use serde::Serialize;
 use tokio::sync::oneshot::Receiver;
 use crate::{
     http_error::HttpError,
@@ -15,13 +14,6 @@ use crate::{
     logic::prompt
 };
 
-#[derive(Serialize)]
-struct Response {
-    session: Session,
-    turn: Turn,
-    tokens_remaining: i32
-}
-
 #[post("/game/{game_id}/session")]
 pub async fn route(
     db: web::Data<PgPool>,
@@ -52,11 +44,11 @@ fn update_db(
     db: web::Data<PgPool>
 ) {
     tokio::spawn(async move {
-        if let Ok((m, it, ot)) = message.await {
+        let _ = if let Ok((m, it, ot)) = message.await {
             let new_turn = Turn::new(session.id, it, ot, user_text, m);
-            session.insert(&db).await;
-            new_turn.insert(&db).await;
-            User::add_tokens(&db, user_id, -new_turn.tokens_used).await;
+            let _ = session.insert(&db).await;
+            let _ = new_turn.insert(&db).await;
+            let _ = User::add_tokens(&db, user_id, -new_turn.tokens_used).await;
             Ok::<(), HttpError>(())
         } else {
             Ok::<(), HttpError>(())

+ 5 - 11
src/controllers/game/session/turn/create.rs

@@ -1,5 +1,5 @@
-use actix_web::{HttpResponse, HttpRequest, Responder, web, post};
-use serde::{Serialize, Deserialize};
+use actix_web::{HttpRequest, Responder, web, post};
+use serde::Deserialize;
 use sqlx::PgPool;
 use uuid::Uuid;
 use tokio::sync::oneshot::Receiver;
@@ -24,12 +24,6 @@ struct Path {
     game_id: String
 }
 
-#[derive(Serialize)]
-struct Response {
-    turn: Turn,
-    tokens_remaining: i32
-}
-
 #[post("/game/{game_id}/session/{session_id}/turn")]
 pub async fn route(
     db: web::Data<PgPool>,
@@ -66,10 +60,10 @@ fn update_db(
     db: web::Data<PgPool>
 ) {
     tokio::spawn(async move {
-        if let Ok((m, it, ot)) = message.await {
+        let _ = if let Ok((m, it, ot)) = message.await {
             let new_turn = Turn::new(session_id, it, ot, user_text, m);
-            new_turn.insert(&db).await;
-            User::add_tokens(&db, user_id, -new_turn.tokens_used).await;
+            let _ = new_turn.insert(&db).await;
+            let _ = User::add_tokens(&db, user_id, -new_turn.tokens_used).await;
             Ok::<(), HttpError>(())
         } else {
             Ok::<(), HttpError>(())

+ 2 - 7
src/logic/prompt.rs

@@ -1,15 +1,10 @@
 use actix_web::{HttpResponse, web::Bytes};
-use actix_web_lab::sse;
 use reqwest::Client;
 use serde::Serialize;
 use serde_json::{Value, json, from_str};
-use futures_util::{StreamExt, TryStreamExt, Stream, stream};
+use futures_util::{StreamExt, stream};
 use tokio::sync::oneshot;
-use std::{
-    convert::Infallible,
-    sync::{Arc, Mutex},
-    pin::Pin
-};
+use std::sync::{Arc, Mutex};
 use crate::{
     http_error::HttpError,
     models::{