Skip to content

Commit 5749aba

Browse files
committed
Auto merge of #1933 - jtgeibel:ok-true, r=carols10cents
Convert more endpoints to `ok_true()`
2 parents dbe39ae + 0fb0f0e commit 5749aba

File tree

2 files changed

+5
-25
lines changed

2 files changed

+5
-25
lines changed

src/controllers/user/me.rs

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,7 @@ pub fn update_user(req: &mut dyn Request) -> AppResult<Response> {
165165
Ok(())
166166
})?;
167167

168-
#[derive(Serialize)]
169-
struct R {
170-
ok: bool,
171-
}
172-
Ok(req.json(&R { ok: true }))
168+
ok_true()
173169
}
174170

175171
/// Handles the `PUT /confirm/:email_token` route
@@ -187,11 +183,7 @@ pub fn confirm_user_email(req: &mut dyn Request) -> AppResult<Response> {
187183
return Err(bad_request("Email belonging to token not found."));
188184
}
189185

190-
#[derive(Serialize)]
191-
struct R {
192-
ok: bool,
193-
}
194-
Ok(req.json(&R { ok: true }))
186+
ok_true()
195187
}
196188

197189
/// Handles `PUT /user/:user_id/resend` route
@@ -218,11 +210,7 @@ pub fn regenerate_token_and_send(req: &mut dyn Request) -> AppResult<Response> {
218210
.map_err(|_| bad_request("Error in sending email"))
219211
})?;
220212

221-
#[derive(Serialize)]
222-
struct R {
223-
ok: bool,
224-
}
225-
Ok(req.json(&R { ok: true }))
213+
ok_true()
226214
}
227215

228216
/// Handles `PUT /me/email_notifications` route
@@ -275,9 +263,5 @@ pub fn update_email_notifications(req: &mut dyn Request) -> AppResult<Response>
275263
.set(email_notifications.eq(excluded(email_notifications)))
276264
.execute(&*conn)?;
277265

278-
#[derive(Serialize)]
279-
struct R {
280-
ok: bool,
281-
}
282-
Ok(req.json(&R { ok: true }))
266+
ok_true()
283267
}

src/controllers/version/yank.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,5 @@ fn modify_yank(req: &mut dyn Request, yanked: bool) -> AppResult<Response> {
4848
.enqueue(&conn)
4949
.map_err(|e| AppError::from_std_error(e))?;
5050

51-
#[derive(Serialize)]
52-
struct R {
53-
ok: bool,
54-
}
55-
Ok(req.json(&R { ok: true }))
51+
ok_true()
5652
}

0 commit comments

Comments
 (0)