FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Remove unnecessary as_str() conversions

Browse source
This commit is contained in:
silverpill 2022-12-03 21:11:28 +00:00
parent 9de45d0443
commit 11ed4c1e48
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/database/test_utils.rs
View file

@ -21,13 +21,13 @@ pub async fn create_test_database() -> Client {
"DROP DATABASE IF EXISTS {db_name:?}", "DROP DATABASE IF EXISTS {db_name:?}",
db_name=db_name, db_name=db_name,
); );
db_client.execute(drop_db_statement.as_str(), &[]).await.unwrap(); db_client.execute(&drop_db_statement, &[]).await.unwrap();
let create_db_statement = format!( let create_db_statement = format!(
"CREATE DATABASE {db_name:?} WITH OWNER={owner:?};", "CREATE DATABASE {db_name:?} WITH OWNER={owner:?};",
db_name=db_name, db_name=db_name,
owner=db_config.get_user().unwrap(), owner=db_config.get_user().unwrap(),
); );
db_client.execute(create_db_statement.as_str(), &[]).await.unwrap(); db_client.execute(&create_db_statement, &[]).await.unwrap();
// Create new connection to database // Create new connection to database
db_config.dbname(&db_name); db_config.dbname(&db_name);

2
src/models/notifications/queries.rs
View file

@ -160,7 +160,7 @@ pub async fn get_notifications(
related_links=RELATED_LINKS, related_links=RELATED_LINKS,
); );
let rows = db_client.query( let rows = db_client.query(
statement.as_str(), &statement,
&[&recipient_id, &max_id, &i64::from(limit)], &[&recipient_id, &max_id, &i64::from(limit)],
).await?; ).await?;
let mut notifications: Vec<Notification> = rows.iter() let mut notifications: Vec<Notification> = rows.iter()

8
src/models/posts/queries.rs
View file

@ -68,7 +68,7 @@ pub async fn create_post(
visibility_public=i16::from(&Visibility::Public), visibility_public=i16::from(&Visibility::Public),
); );
let maybe_post_row = transaction.query_opt( let maybe_post_row = transaction.query_opt(
insert_statement.as_str(), &insert_statement,
&[ &[
&post_id, &post_id,
&author_id, &author_id,
@ -586,7 +586,7 @@ pub async fn get_post_by_id(
related_links=RELATED_LINKS, related_links=RELATED_LINKS,
); );
let maybe_row = db_client.query_opt( let maybe_row = db_client.query_opt(
statement.as_str(), &statement,
&[&post_id], &[&post_id],
).await?; ).await?;
let post = match maybe_row { let post = match maybe_row {
@ -678,7 +678,7 @@ pub async fn get_post_by_remote_object_id(
related_links=RELATED_LINKS, related_links=RELATED_LINKS,
); );
let maybe_row = db_client.query_opt( let maybe_row = db_client.query_opt(
statement.as_str(), &statement,
&[&object_id], &[&object_id],
).await?; ).await?;
let row = maybe_row.ok_or(DatabaseError::NotFound("post"))?; let row = maybe_row.ok_or(DatabaseError::NotFound("post"))?;
@ -708,7 +708,7 @@ pub async fn get_post_by_ipfs_cid(
related_links=RELATED_LINKS, related_links=RELATED_LINKS,
); );
let result = db_client.query_opt( let result = db_client.query_opt(
statement.as_str(), &statement,
&[&ipfs_cid], &[&ipfs_cid],
).await?; ).await?;
let post = match result { let post = match result {