From 7ab810aa95cf80a023ebb7c5b15f964c67032d42 Mon Sep 17 00:00:00 2001 From: Ashley Anderson Date: Tue, 16 Nov 2021 11:41:54 -0500 Subject: [PATCH] Fix panic when parsing ABI tag on Windows. --- pyo3-build-config/src/impl_.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs index ce39239c2f4..776e1c7dad9 100644 --- a/pyo3-build-config/src/impl_.rs +++ b/pyo3-build-config/src/impl_.rs @@ -236,11 +236,7 @@ print("mingw", get_platform().startswith("mingw")) let abi3 = is_abi3(); let abi_flags = map["abiflags"].to_string(); let soabi = map["soabi"].as_str(); - let abi_tag = soabi - .split('-') - .nth(1) - .map(ToString::to_string) - .expect("unable to parse ABI tag from SOABI"); + let abi_tag = soabi.split('-').nth(1).map(ToString::to_string); let ext_suffix = map["ext_suffix"].to_string(); let implementation = map["implementation"].parse()?; @@ -282,7 +278,7 @@ print("mingw", get_platform().startswith("mingw")) shared, abi3, abi_flags: Some(abi_flags), - abi_tag: Some(abi_tag), + abi_tag, ext_suffix: Some(ext_suffix), lib_name: Some(lib_name), lib_dir,