Skip to content

Commit 661c355

Browse files
notheotherbennotheotherben
committed
fix: Address issues with Rust nightly caused by rust-lang/rust#79819 
1 parent b83f462 commit 661c355

17 files changed

+64
-64
lines changed

‎src/api/collections/get_collection.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ async fn get_collection_v3(
1212
require_role!(token, "Administrator", "User");
1313
require_scope!(token, "Collections.Read");
1414

15-
let cid = parse_uuid!(info.collection, collection ID);
16-
let uid = parse_uuid!(token.oid(), auth token oid);
15+
let cid = parse_uuid!(info.collection, "collection ID");
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
1717

1818
state.store.send(GetCollection { id: cid, principal_id: uid }.trace()).await?.map(|collection| collection.clone().into())
1919
}

‎src/api/collections/get_collections.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ async fn get_collections_v3(
1111
require_role!(token, "Administrator", "User");
1212
require_scope!(token, "Collections.Read");
1313

14-
let uid = parse_uuid!(token.oid(), auth token oid);
14+
let uid = parse_uuid!(token.oid(), "auth token oid");
1515

1616
ensure_user_collection(&state, &token).await?;
1717

‎src/api/collections/new_collection.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ async fn new_collection_v3(
1313
require_role!(token, "Administrator", "User");
1414
require_scope!(token, "Collections.Write");
1515

16-
let uid = parse_uuid!(token.oid(), auth token oid);
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
1717

1818
let collection = state.store.send(StoreCollection {
1919
principal_id: uid,

‎src/api/collections/remove_collection.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ async fn remove_collection_v3(
1212
require_role!(token, "Administrator", "User");
1313
require_scope!(token, "Collections.Write");
1414

15-
let cid = parse_uuid!(info.collection, collection ID);
16-
let uid = parse_uuid!(token.oid(), auth token oid);
15+
let cid = parse_uuid!(info.collection, "collection ID");
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
1717

1818
state.store.send(RemoveCollection { id: cid, principal_id: uid }.trace()).await??;
1919

‎src/api/collections/store_collection.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ async fn store_collection_v3(
1414
require_role!(token, "Administrator", "User");
1515
require_scope!(token, "Collections.Write");
1616

17-
let cid = parse_uuid!(info.collection, collection ID);
18-
let uid = parse_uuid!(token.oid(), auth token oid);
17+
let cid = parse_uuid!(info.collection, "collection ID");
18+
let uid = parse_uuid!(token.oid(), "auth token oid");
1919

2020
state.store.send(StoreCollection {
2121
principal_id: uid,

‎src/api/ideas/get_idea.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ async fn get_idea_v1(
1212
require_role!(token, "Administrator", "User");
1313
require_scope!(token, "Ideas.Read");
1414

15-
let id = parse_uuid!(info.id, idea ID);
16-
let uid = parse_uuid!(token.oid(), auth token oid);
15+
let id = parse_uuid!(info.id, "idea ID");
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
1717

1818
state.store.send(GetIdea { collection: uid, id: id }.trace()).await?.map(|idea| idea.clone().into())
1919
}
@@ -26,8 +26,8 @@ async fn get_idea_v2(
2626
require_role!(token, "Administrator", "User");
2727
require_scope!(token, "Ideas.Read");
2828

29-
let id = parse_uuid!(info.id, idea ID);
30-
let uid = parse_uuid!(token.oid(), auth token oid);
29+
let id = parse_uuid!(info.id, "idea ID");
30+
let uid = parse_uuid!(token.oid(), "auth token oid");
3131

3232
state.store.send(GetIdea { collection: uid, id: id }.trace()).await?.map(|idea| idea.clone().into())
3333
}
@@ -40,8 +40,8 @@ async fn get_idea_v3(
4040
require_role!(token, "Administrator", "User");
4141
require_scope!(token, "Ideas.Read");
4242

43-
let id = parse_uuid!(info.id, idea ID);
44-
let uid = parse_uuid!(token.oid(), auth token oid);
43+
let id = parse_uuid!(info.id, "idea ID");
44+
let uid = parse_uuid!(token.oid(), "auth token oid");
4545

4646
ensure_user_collection(&state, &token).await?;
4747

@@ -56,9 +56,9 @@ async fn get_collection_idea_v3(
5656
require_role!(token, "Administrator", "User");
5757
require_scope!(token, "Ideas.Read");
5858

59-
let id = parse_uuid!(info.id, idea ID);
60-
let cid = parse_uuid!(info.collection, collection ID);
61-
let uid = parse_uuid!(token.oid(), auth token oid);
59+
let id = parse_uuid!(info.id, "idea ID");
60+
let cid = parse_uuid!(info.collection, "collection ID");
61+
let uid = parse_uuid!(token.oid(), "auth token oid");
6262

6363
ensure_user_collection(&state, &token).await?;
6464

‎src/api/ideas/get_ideas.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ async fn get_ideas_v1(
1212
require_role!(token, "Administrator", "User");
1313
require_scope!(token, "Ideas.Read");
1414

15-
let uid = parse_uuid!(token.oid(), auth token oid);
15+
let uid = parse_uuid!(token.oid(), "auth token oid");
1616

1717
state.store.send(GetIdeas { collection: uid, is_completed: None, tag: None }.trace()).await?.map(|ideas| web::Json(ideas.iter().map(|i| i.clone().into()).collect()))
1818
}
@@ -25,7 +25,7 @@ async fn get_ideas_v2(
2525
require_role!(token, "Administrator", "User");
2626
require_scope!(token, "Ideas.Read");
2727

28-
let uid = parse_uuid!(token.oid(), auth token oid);
28+
let uid = parse_uuid!(token.oid(), "auth token oid");
2929

3030
state.store.send(GetIdeas {
3131
collection: uid,
@@ -42,7 +42,7 @@ async fn get_ideas_v3(
4242
require_role!(token, "Administrator", "User");
4343
require_scope!(token, "Ideas.Read");
4444

45-
let uid = parse_uuid!(token.oid(), auth token oid);
45+
let uid = parse_uuid!(token.oid(), "auth token oid");
4646

4747
ensure_user_collection(&state, &token).await?;
4848
state.store.send(GetRoleAssignment { principal_id: uid, collection_id: uid }).await??;
@@ -62,8 +62,8 @@ async fn get_collection_ideas_v3(
6262
require_role!(token, "Administrator", "User");
6363
require_scope!(token, "Ideas.Read");
6464

65-
let cid = parse_uuid!(info.collection, collection ID);
66-
let uid = parse_uuid!(token.oid(), auth token oid);
65+
let cid = parse_uuid!(info.collection, "collection ID");
66+
let uid = parse_uuid!(token.oid(), "auth token oid");
6767

6868
ensure_user_collection(&state, &token).await?;
6969
state.store.send(GetRoleAssignment { principal_id: uid, collection_id: cid }.trace()).await??;

‎src/api/ideas/get_random_idea.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ async fn get_random_idea_v1(state: web::Data<GlobalState>, token: AuthToken) ->
99
require_role!(token, "Administrator", "User");
1010
require_scope!(token, "Ideas.Read");
1111

12-
let uid = parse_uuid!(token.oid(), auth token oid);
12+
let uid = parse_uuid!(token.oid(), "auth token oid");
1313

1414
state.store.send(GetRandomIdea { collection: uid, is_completed: None, tag: None }.trace()).await?.map(|idea| idea.clone().into())
1515
}
@@ -22,7 +22,7 @@ async fn get_random_idea_v2(
2222
require_role!(token, "Administrator", "User");
2323
require_scope!(token, "Ideas.Read");
2424

25-
let uid = parse_uuid!(token.oid(), auth token oid);
25+
let uid = parse_uuid!(token.oid(), "auth token oid");
2626

2727
state.store.send(GetRandomIdea { collection: uid, is_completed: query.complete, tag: query.tag.clone() }.trace()).await?.map(|idea| idea.clone().into())
2828
}
@@ -35,7 +35,7 @@ async fn get_random_idea_v3(
3535
require_role!(token, "Administrator", "User");
3636
require_scope!(token, "Ideas.Read");
3737

38-
let uid = parse_uuid!(token.oid(), auth token oid);
38+
let uid = parse_uuid!(token.oid(), "auth token oid");
3939

4040
ensure_user_collection(&state, &token).await?;
4141
state.store.send(GetRoleAssignment { principal_id: uid, collection_id: uid }.trace()).await??;
@@ -51,8 +51,8 @@ async fn get_random_collection_idea_v3(
5151
require_role!(token, "Administrator", "User");
5252
require_scope!(token, "Ideas.Read");
5353

54-
let cid = parse_uuid!(info.collection, collection ID);
55-
let uid = parse_uuid!(token.oid(), auth token oid);
54+
let cid = parse_uuid!(info.collection, "collection ID");
55+
let uid = parse_uuid!(token.oid(), "auth token oid");
5656

5757
state.store.send(GetRoleAssignment { principal_id: uid, collection_id: cid }.trace()).await??;
5858

‎src/api/ideas/new_idea.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ async fn new_idea_v1(
1313
require_scope!(token, "Ideas.Write");
1414

1515
let idea: Idea = new_idea.into_inner().into();
16-
let uid = parse_uuid!(token.oid(), auth token oid);
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
1717

1818
ensure_user_collection(&state, &token).await?;
1919

@@ -36,7 +36,7 @@ async fn new_idea_v2(
3636
require_scope!(token, "Ideas.Write");
3737

3838
let idea: Idea = new_idea.into_inner().into();
39-
let uid = parse_uuid!(token.oid(), auth token oid);
39+
let uid = parse_uuid!(token.oid(), "auth token oid");
4040

4141
ensure_user_collection(&state, &token).await?;
4242

@@ -59,7 +59,7 @@ async fn new_idea_v3(
5959
require_scope!(token, "Ideas.Write");
6060

6161
let idea: Idea = new_idea.into_inner().into();
62-
let uid = parse_uuid!(token.oid(), auth token oid);
62+
let uid = parse_uuid!(token.oid(), "auth token oid");
6363

6464
ensure_user_collection(&state, &token).await?;
6565

@@ -82,8 +82,8 @@ async fn new_collection_idea_v3(
8282
require_scope!(token, "Ideas.Write");
8383

8484
let idea: Idea = new_idea.into_inner().into();
85-
let cid = parse_uuid!(info.collection, collection ID);
86-
let uid = parse_uuid!(token.oid(), auth token oid);
85+
let cid = parse_uuid!(info.collection, "collection ID");
86+
let uid = parse_uuid!(token.oid(), "auth token oid");
8787

8888
if cid == uid {
8989
ensure_user_collection(&state, &token).await?;

‎src/api/ideas/remove_idea.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ async fn remove_idea_v1(
1212
require_role!(token, "Administrator", "User");
1313
require_scope!(token, "Ideas.Write");
1414

15-
let id = parse_uuid!(info.id, idea ID);
16-
let uid = parse_uuid!(token.oid(), auth token oid);
15+
let id = parse_uuid!(info.id, "idea ID");
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
1717

1818
state.store.send(RemoveIdea { collection: uid, id: id }.trace()).await??;
1919

@@ -28,8 +28,8 @@ async fn remove_idea_v2(
2828
require_role!(token, "Administrator", "User");
2929
require_scope!(token, "Ideas.Write");
3030

31-
let id = parse_uuid!(info.id, idea ID);
32-
let uid = parse_uuid!(token.oid(), auth token oid);
31+
let id = parse_uuid!(info.id, "idea ID");
32+
let uid = parse_uuid!(token.oid(), "auth token oid");
3333

3434
state.store.send(RemoveIdea { collection: uid, id: id }.trace()).await??;
3535

@@ -44,8 +44,8 @@ async fn remove_idea_v3(
4444
require_role!(token, "Administrator", "User");
4545
require_scope!(token, "Ideas.Write");
4646

47-
let id = parse_uuid!(info.id, idea ID);
48-
let uid = parse_uuid!(token.oid(), auth token oid);
47+
let id = parse_uuid!(info.id, "idea ID");
48+
let uid = parse_uuid!(token.oid(), "auth token oid");
4949

5050
state.store.send(RemoveIdea { collection: uid, id: id }.trace()).await??;
5151

@@ -60,9 +60,9 @@ async fn remove_collection_idea_v3(
6060
require_role!(token, "Administrator", "User");
6161
require_scope!(token, "Ideas.Write");
6262

63-
let id = parse_uuid!(info.id, idea ID);
64-
let cid = parse_uuid!(info.collection, collection ID);
65-
let uid = parse_uuid!(token.oid(), auth token oid);
63+
let id = parse_uuid!(info.id, "idea ID");
64+
let cid = parse_uuid!(info.collection, "collection ID");
65+
let uid = parse_uuid!(token.oid(), "auth token oid");
6666

6767
ensure_user_collection(&state, &token).await?;
6868

‎src/api/ideas/store_idea.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ async fn store_idea_v1(
1818
require_scope!(token, "Ideas.Write");
1919

2020
let idea: Idea = new_idea.into_inner().into();
21-
let id = parse_uuid!(info.id, idea ID);
22-
let uid = parse_uuid!(token.oid(), auth token oid);
21+
let id = parse_uuid!(info.id, "idea ID");
22+
let uid = parse_uuid!(token.oid(), "auth token oid");
2323

2424
ensure_user_collection(&state, &token).await?;
2525

@@ -47,8 +47,8 @@ async fn store_idea_v2(
4747
require_scope!(token, "Ideas.Write");
4848

4949
let idea: Idea = new_idea.into_inner().into();
50-
let id = parse_uuid!(info.id, idea ID);
51-
let uid = parse_uuid!(token.oid(), auth token oid);
50+
let id = parse_uuid!(info.id, "idea ID");
51+
let uid = parse_uuid!(token.oid(), "auth token oid");
5252

5353
ensure_user_collection(&state, &token).await?;
5454

@@ -76,8 +76,8 @@ async fn store_idea_v3(
7676
require_scope!(token, "Ideas.Write");
7777

7878
let idea: Idea = new_idea.into_inner().into();
79-
let id = parse_uuid!(info.id, idea ID);
80-
let uid = parse_uuid!(token.oid(), auth token oid);
79+
let id = parse_uuid!(info.id, "idea ID");
80+
let uid = parse_uuid!(token.oid(), "auth token oid");
8181

8282
ensure_user_collection(&state, &token).await?;
8383

@@ -105,9 +105,9 @@ async fn store_collection_idea_v3(
105105
require_scope!(token, "Ideas.Write");
106106

107107
let idea: Idea = new_idea.into_inner().into();
108-
let id = parse_uuid!(info.id, idea ID);
109-
let cid = parse_uuid!(info.collection, collection ID);
110-
let uid = parse_uuid!(token.oid(), auth token oid);
108+
let id = parse_uuid!(info.id, "idea ID");
109+
let cid = parse_uuid!(info.collection, "collection ID");
110+
let uid = parse_uuid!(token.oid(), "auth token oid");
111111

112112
ensure_user_collection(&state, &token).await?;
113113

‎src/api/macros.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#[macro_export]
22
macro_rules! parse_uuid {
3-
($from:expr, $($desc:tt)+) => {
3+
($from:expr, $desc:expr) => {
44
u128::from_str_radix($from.replace("-", "").as_str(), 16)
5-
.or(Err(APIError::new(400, "Bad Request", "The $($desc)+ you provided could not be parsed. Please check it and try again.")))?;
5+
.or(Err(APIError::new(400, "Bad Request", &format!("The {} you provided could not be parsed. Please check it and try again.", $desc))))?
66
};
77
}
88

‎src/api/role_assignments/get_role_assignment.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ async fn get_role_assignment_v3(
1212
require_role!(token, "Administrator", "User");
1313
require_scope!(token, "RoleAssignments.Write");
1414

15-
let cid = parse_uuid!(info.collection, collection ID);
16-
let uid = parse_uuid!(token.oid(), auth token oid);
17-
let tuid = parse_uuid!(info.user, user ID);
15+
let cid = parse_uuid!(info.collection, "collection ID");
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
17+
let tuid = parse_uuid!(info.user, "user ID");
1818

1919
if uid != tuid {
2020
let role = state.store.send(GetRoleAssignment { collection_id: cid, principal_id: uid }.trace()).await??;

‎src/api/role_assignments/get_role_assignments.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ async fn get_role_assignments_v3(
1212
require_role!(token, "Administrator", "User");
1313
require_scope!(token, "RoleAssignments.Write");
1414

15-
let cid = parse_uuid!(info.collection, collection ID);
16-
let uid = parse_uuid!(token.oid(), auth token oid);
15+
let cid = parse_uuid!(info.collection, "collection ID");
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
1717

1818
let role = state.store.send(GetRoleAssignment { collection_id: cid, principal_id: uid }.trace()).await??;
1919
match role.role {

‎src/api/role_assignments/remove_role_assignment.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ async fn remove_role_assignment_v3(
1212
require_role!(token, "Administrator", "User");
1313
require_scope!(token, "RoleAssignments.Write");
1414

15-
let cid = parse_uuid!(info.collection, collection ID);
16-
let uid = parse_uuid!(token.oid(), auth token oid);
17-
let tuid = parse_uuid!(info.user, user ID);
15+
let cid = parse_uuid!(info.collection, "collection ID");
16+
let uid = parse_uuid!(token.oid(), "auth token oid");
17+
let tuid = parse_uuid!(info.user, "user ID");
1818

1919
if tuid == uid {
2020
return Err(APIError::new(400, "Bad Request", "You cannot remove yourself from a collection. Please request that another collection owner performs this for you."))

‎src/api/role_assignments/store_role_assignment.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ async fn store_role_assignment_v3(
1414
require_role!(token, "Administrator", "User");
1515
require_scope!(token, "RoleAssignments.Write");
1616

17-
let cid = parse_uuid!(info.collection, collection ID);
18-
let uid = parse_uuid!(token.oid(), auth token oid);
19-
let tuid = parse_uuid!(info.user, user ID);
17+
let cid = parse_uuid!(info.collection, "collection ID");
18+
let uid = parse_uuid!(token.oid(), "auth token oid");
19+
let tuid = parse_uuid!(info.user, "user ID");
2020

2121
let original_collection = state.store.send(GetCollection {
2222
id: cid,

‎src/api/users/get_user.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ async fn get_user_v3(
1111
) -> Result<UserV3, APIError> {
1212
require_role!(token, "Administrator", "User");
1313

14-
let tuid = parse_uuid!(info.user, user ID);
14+
let tuid = parse_uuid!(info.user, "user ID");
1515

1616
state.store.send(GetUser { email_hash: tuid }.trace()).await?.map(|user| user.clone().into())
1717
}

0 commit comments

Comments
 (0)