File tree Expand file tree Collapse file tree 1 file changed +7
-9
lines changed Expand file tree Collapse file tree 1 file changed +7
-9
lines changed Original file line number Diff line number Diff line change @@ -166,21 +166,19 @@ impl Version {
166
166
}
167
167
168
168
pub fn authors ( & self , conn : & GenericConnection ) -> CargoResult < Vec < Author > > {
169
- let stmt = try! ( conn. prepare ( "SELECT * FROM version_authors
170
- WHERE version_id = $1" ) ) ;
171
- let rows = try! ( stmt. query ( & [ & self . id ] ) ) ;
172
- let mut authors: CargoResult < Vec < Author > > = rows. into_iter ( ) . map ( |row| {
169
+ let stmt = conn. prepare ( "SELECT * FROM version_authors
170
+ WHERE version_id = $1" ) ? ;
171
+ let rows = stmt. query ( & [ & self . id ] ) ? ;
172
+ let mut authors = rows. into_iter ( ) . map ( |row| {
173
173
let user_id: Option < i32 > = row. get ( "user_id" ) ;
174
174
let name: String = row. get ( "name" ) ;
175
175
Ok ( match user_id {
176
176
Some ( id) => Author :: User ( User :: find ( conn, id) ?) ,
177
177
None => Author :: Name ( name) ,
178
178
} )
179
- } ) . collect ( ) ;
180
- if let Ok ( ref mut v) = authors {
181
- v. sort_by ( |ref a, ref b| a. name ( ) . cmp ( & b. name ( ) ) ) ;
182
- }
183
- authors
179
+ } ) . collect :: < CargoResult < Vec < Author > > > ( ) ?;
180
+ authors. sort_by ( |ref a, ref b| a. name ( ) . cmp ( & b. name ( ) ) ) ;
181
+ Ok ( authors)
184
182
}
185
183
186
184
pub fn add_author ( & self ,
You can’t perform that action at this time.
0 commit comments