@@ -231,8 +231,8 @@ fn get_interpreter_version(line: &str) -> Result<PythonVersion, String> {
231231 let version_re = Regex :: new ( r"\((\d+), (\d+)\)" ) . unwrap ( ) ;
232232 match version_re. captures ( & line) {
233233 Some ( cap) => Ok ( PythonVersion {
234- major : cap. at ( 1 ) . unwrap ( ) . parse ( ) . unwrap ( ) ,
235- minor : Some ( cap. at ( 2 ) . unwrap ( ) . parse ( ) . unwrap ( ) )
234+ major : cap. get ( 1 ) . unwrap ( ) . as_str ( ) . parse ( ) . unwrap ( ) ,
235+ minor : Some ( cap. get ( 2 ) . unwrap ( ) . as_str ( ) . parse ( ) . unwrap ( ) )
236236 } ) ,
237237 None => Err (
238238 format ! ( "Unexpected response to version query {}" , line) )
@@ -373,10 +373,10 @@ fn version_from_env() -> Result<PythonVersion, String> {
373373 vars. sort_by ( |a, b| b. cmp ( a) ) ;
374374 for ( key, _) in vars {
375375 match re. captures ( & key) {
376- Some ( cap) => return Ok ( PythonVersion {
377- major : cap. at ( 1 ) . unwrap ( ) . parse ( ) . unwrap ( ) ,
378- minor : match cap. at ( 3 ) {
379- Some ( s) => Some ( s. parse ( ) . unwrap ( ) ) ,
376+ Some ( cap) => return Ok ( PythonVersion {
377+ major : cap. get ( 1 ) . unwrap ( ) . as_str ( ) . parse ( ) . unwrap ( ) ,
378+ minor : match cap. get ( 3 ) {
379+ Some ( s) => Some ( s. as_str ( ) . parse ( ) . unwrap ( ) ) ,
380380 None => None
381381 }
382382 } ) ,
0 commit comments