File tree Expand file tree Collapse file tree 1 file changed +8
-17
lines changed Expand file tree Collapse file tree 1 file changed +8
-17
lines changed Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ pub fn downloads(req: &mut dyn RequestExt) -> EndpointResult {
32
32
. load ( & * conn) ?
33
33
. into_iter ( )
34
34
. map ( VersionDownload :: into)
35
- . collect :: < Vec < _ > > ( ) ;
35
+ . collect :: < Vec < EncodableVersionDownload > > ( ) ;
36
36
37
37
let sum_downloads = sql :: < BigInt > ( "SUM(version_downloads.downloads)" ) ;
38
38
let extra: Vec < ExtraDownload > = VersionDownload :: belonging_to ( rest)
@@ -50,20 +50,11 @@ pub fn downloads(req: &mut dyn RequestExt) -> EndpointResult {
50
50
date : String ,
51
51
downloads : i64 ,
52
52
}
53
- #[ derive( Serialize ) ]
54
- struct R {
55
- version_downloads : Vec < EncodableVersionDownload > ,
56
- meta : Meta ,
57
- }
58
- #[ derive( Serialize ) ]
59
- struct Meta {
60
- extra_downloads : Vec < ExtraDownload > ,
61
- }
62
- let meta = Meta {
63
- extra_downloads : extra,
64
- } ;
65
- Ok ( req. json ( & R {
66
- version_downloads : downloads,
67
- meta,
68
- } ) )
53
+
54
+ Ok ( req. json ( & json ! ( {
55
+ "version_downloads" : downloads,
56
+ "meta" : {
57
+ "extra_downloads" : extra,
58
+ } ,
59
+ } ) ) )
69
60
}
You can’t perform that action at this time.
0 commit comments