Skip to content

Commit b46f126

Browse files
committed
fixup: c445bc4
1 parent 4ec9a1b commit b46f126

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

src/validation.rs

+20-16
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ const GLOBAL_EXTENSIONS: &[&str] = &[
681681
// We didn't build ctypes_test until 3.9.
682682
// We didn't build some test extensions until 3.9.
683683

684-
const GLOBAL_EXTENSIONS_PYTHON_3_8: &[&str] = &["_sha256", "_sha512", "parser"];
684+
const GLOBAL_EXTENSIONS_PYTHON_3_8: &[&str] = &["audioop", "_sha256", "_sha512", "parser"];
685685

686686
const GLOBAL_EXTENSIONS_PYTHON_3_9: &[&str] = &[
687687
"audioop",
@@ -725,16 +725,16 @@ const GLOBAL_EXTENSIONS_PYTHON_3_12: &[&str] = &[
725725
];
726726

727727
const GLOBAL_EXTENSIONS_PYTHON_3_13: &[&str] = &[
728-
"_sha2",
729-
"_tokenize",
730-
"_typing",
731728
"_interpchannels",
732-
"_subinterpreters",
733-
"_zoneinfo",
729+
"_interpqueues",
734730
"_interpreters",
731+
"_sha2",
735732
"_suggestions",
736733
"_sysconfig",
737734
"_testexternalinspection",
735+
"_tokenize",
736+
"_typing",
737+
"_zoneinfo",
738738
];
739739

740740
const GLOBAL_EXTENSIONS_MACOS: &[&str] = &["_scproxy"];
@@ -1073,7 +1073,11 @@ fn validate_elf<'data, Elf: FileHeader<Endian = Endianness>>(
10731073
if let Some(filename) = path.file_name() {
10741074
let filename = filename.to_string_lossy();
10751075

1076-
if filename.starts_with("libpython") && filename.ends_with(".so.1.0") && matches!(symbol.st_bind(), STB_GLOBAL | STB_WEAK) && symbol.st_visibility() == STV_DEFAULT {
1076+
if filename.starts_with("libpython")
1077+
&& filename.ends_with(".so.1.0")
1078+
&& matches!(symbol.st_bind(), STB_GLOBAL | STB_WEAK)
1079+
&& symbol.st_visibility() == STV_DEFAULT
1080+
{
10771081
context.libpython_exported_symbols.insert(name.to_string());
10781082
}
10791083
}
@@ -1659,14 +1663,12 @@ fn validate_json(json: &PythonJsonMain, triple: &str, is_debug: bool) -> Result<
16591663
.map(|x| x.as_str())
16601664
.collect::<BTreeSet<_>>();
16611665

1662-
errors.extend(
1663-
validate_extension_modules(
1664-
&json.python_major_minor_version,
1665-
triple,
1666-
json.crt_features.contains(&"static".to_string()),
1667-
&have_extensions,
1668-
)?,
1669-
);
1666+
errors.extend(validate_extension_modules(
1667+
&json.python_major_minor_version,
1668+
triple,
1669+
json.crt_features.contains(&"static".to_string()),
1670+
&have_extensions,
1671+
)?);
16701672

16711673
Ok(errors)
16721674
}
@@ -1998,7 +2000,9 @@ fn validate_distribution(
19982000
} else if triple.contains("-windows-") {
19992001
false
20002002
// Presence of a shared library extension implies no export.
2001-
} else { ext.shared_lib.is_none() };
2003+
} else {
2004+
ext.shared_lib.is_none()
2005+
};
20022006

20032007
if exported != wanted {
20042008
context.errors.push(format!(

0 commit comments

Comments
 (0)