@@ -22,10 +22,12 @@ type BoxedError = Box<dyn Error + Send + Sync>;
22
22
pub async fn handle_triage (
23
23
body : api:: triage:: Request ,
24
24
ctxt : & SiteCtxt ,
25
- ) -> Result < api:: triage:: Response , BoxedError > {
25
+ ) -> api :: ServerResult < api:: triage:: Response > {
26
26
let start = body. start ;
27
27
let end = body. end ;
28
- let master_commits = collector:: master_commits ( ) . await ?;
28
+ let master_commits = collector:: master_commits ( )
29
+ . await
30
+ . map_err ( |e| format ! ( "error retrieving master commit list: {}" , e) ) ?;
29
31
30
32
let start_artifact = ctxt
31
33
. artifact_id_for_bound ( start. clone ( ) , true )
@@ -47,7 +49,8 @@ pub async fn handle_triage(
47
49
& master_commits,
48
50
body. calcNewSig . unwrap_or ( false ) ,
49
51
)
50
- . await ?
52
+ . await
53
+ . map_err ( |e| format ! ( "error comparing commits: {}" , e) ) ?
51
54
{
52
55
Some ( c) => c,
53
56
None => {
@@ -87,8 +90,10 @@ pub async fn handle_triage(
87
90
pub async fn handle_compare (
88
91
body : api:: comparison:: Request ,
89
92
ctxt : & SiteCtxt ,
90
- ) -> Result < api:: comparison:: Response , BoxedError > {
91
- let master_commits = collector:: master_commits ( ) . await ?;
93
+ ) -> api:: ServerResult < api:: comparison:: Response > {
94
+ let master_commits = collector:: master_commits ( )
95
+ . await
96
+ . map_err ( |e| format ! ( "error retrieving master commit list: {}" , e) ) ?;
92
97
let end = body. end ;
93
98
let comparison = compare_given_commits (
94
99
body. start ,
@@ -98,7 +103,8 @@ pub async fn handle_compare(
98
103
& master_commits,
99
104
body. calcNewSig . unwrap_or ( false ) ,
100
105
)
101
- . await ?
106
+ . await
107
+ . map_err ( |e| format ! ( "error comparing commits: {}" , e) ) ?
102
108
. ok_or_else ( || format ! ( "could not find end commit for bound {:?}" , end) ) ?;
103
109
104
110
let conn = ctxt. conn ( ) . await ;
0 commit comments