@@ -481,30 +481,30 @@ impl DbError {
481481 pub fn new_raw ( fields : Vec < ( u8 , String ) > ) -> result:: Result < DbError , ( ) > {
482482 let mut map: HashMap < _ , _ > = fields. into_iter ( ) . collect ( ) ;
483483 Ok ( DbError {
484- severity : try!( map. pop ( & b'S' ) . ok_or ( ( ) ) ) ,
485- code : SqlState :: from_code ( try!( map. pop ( & b'C' ) . ok_or ( ( ) ) ) [ ] ) ,
486- message : try!( map. pop ( & b'M' ) . ok_or ( ( ) ) ) ,
487- detail : map. pop ( & b'D' ) ,
488- hint : map. pop ( & b'H' ) ,
489- position : match map. pop ( & b'P' ) {
484+ severity : try!( map. remove ( & b'S' ) . ok_or ( ( ) ) ) ,
485+ code : SqlState :: from_code ( try!( map. remove ( & b'C' ) . ok_or ( ( ) ) ) [ ] ) ,
486+ message : try!( map. remove ( & b'M' ) . ok_or ( ( ) ) ) ,
487+ detail : map. remove ( & b'D' ) ,
488+ hint : map. remove ( & b'H' ) ,
489+ position : match map. remove ( & b'P' ) {
490490 Some ( pos) => Some ( ErrorPosition :: Normal ( try!( from_str ( pos[ ] ) . ok_or ( ( ) ) ) ) ) ,
491- None => match map. pop ( & b'p' ) {
491+ None => match map. remove ( & b'p' ) {
492492 Some ( pos) => Some ( ErrorPosition :: Internal {
493493 position : try!( from_str ( pos[ ] ) . ok_or ( ( ) ) ) ,
494- query : try!( map. pop ( & b'q' ) . ok_or ( ( ) ) )
494+ query : try!( map. remove ( & b'q' ) . ok_or ( ( ) ) )
495495 } ) ,
496496 None => None
497497 }
498498 } ,
499- where_ : map. pop ( & b'W' ) ,
500- schema : map. pop ( & b's' ) ,
501- table : map. pop ( & b't' ) ,
502- column : map. pop ( & b'c' ) ,
503- datatype : map. pop ( & b'd' ) ,
504- constraint : map. pop ( & b'n' ) ,
505- file : try!( map. pop ( & b'F' ) . ok_or ( ( ) ) ) ,
506- line : try!( map. pop ( & b'L' ) . and_then ( |l| from_str ( l[ ] ) ) . ok_or ( ( ) ) ) ,
507- routine : try!( map. pop ( & b'R' ) . ok_or ( ( ) ) ) ,
499+ where_ : map. remove ( & b'W' ) ,
500+ schema : map. remove ( & b's' ) ,
501+ table : map. remove ( & b't' ) ,
502+ column : map. remove ( & b'c' ) ,
503+ datatype : map. remove ( & b'd' ) ,
504+ constraint : map. remove ( & b'n' ) ,
505+ file : try!( map. remove ( & b'F' ) . ok_or ( ( ) ) ) ,
506+ line : try!( map. remove ( & b'L' ) . and_then ( |l| from_str ( l[ ] ) ) . ok_or ( ( ) ) ) ,
507+ routine : try!( map. remove ( & b'R' ) . ok_or ( ( ) ) ) ,
508508 } )
509509 }
510510
0 commit comments