Skip to content

Commit 9d6b56f

Browse files
committed
found more symbols
1 parent 64c90fd commit 9d6b56f

File tree

9 files changed

+25
-137
lines changed

9 files changed

+25
-137
lines changed

pyo3-ffi/src/abstract_.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,13 @@ extern "C" {
5454
...
5555
) -> *mut PyObject;
5656

57-
#[cfg(not(Py_3_13))]
57+
#[cfg(PyPy)]
5858
#[cfg_attr(PyPy, link_name = "_PyPyObject_CallFunction_SizeT")]
59-
pub fn _PyObject_CallFunction_SizeT(
59+
pub(crate) fn _PyObject_CallFunction_SizeT(
6060
callable_object: *mut PyObject,
6161
format: *const c_char,
6262
...
6363
) -> *mut PyObject;
64-
#[cfg(not(Py_3_13))]
65-
#[cfg_attr(PyPy, link_name = "_PyPyObject_CallMethod_SizeT")]
66-
pub fn _PyObject_CallMethod_SizeT(
67-
o: *mut PyObject,
68-
method: *const c_char,
69-
format: *const c_char,
70-
...
71-
) -> *mut PyObject;
7264

7365
#[cfg_attr(PyPy, link_name = "PyPyObject_CallFunctionObjArgs")]
7466
pub fn PyObject_CallFunctionObjArgs(callable: *mut PyObject, ...) -> *mut PyObject;

pyo3-ffi/src/cpython/abstract_.rs

Lines changed: 4 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -124,44 +124,9 @@ extern "C" {
124124
) -> *mut PyObject;
125125
}
126126

127-
#[cfg(all(Py_3_8, not(any(PyPy, GraalPy))))]
128-
#[inline(always)]
129-
pub unsafe fn _PyObject_FastCallTstate(
130-
tstate: *mut PyThreadState,
131-
func: *mut PyObject,
132-
args: *const *mut PyObject,
133-
nargs: Py_ssize_t,
134-
) -> *mut PyObject {
135-
_PyObject_VectorcallTstate(tstate, func, args, nargs as size_t, std::ptr::null_mut())
136-
}
137-
138-
#[cfg(all(Py_3_8, not(any(PyPy, GraalPy))))]
139-
#[inline(always)]
140-
pub unsafe fn _PyObject_FastCall(
141-
func: *mut PyObject,
142-
args: *const *mut PyObject,
143-
nargs: Py_ssize_t,
144-
) -> *mut PyObject {
145-
_PyObject_FastCallTstate(PyThreadState_GET(), func, args, nargs)
146-
}
147-
148-
#[cfg(all(Py_3_8, not(PyPy)))]
149-
#[inline(always)]
150-
pub unsafe fn _PyObject_CallNoArg(func: *mut PyObject) -> *mut PyObject {
151-
_PyObject_VectorcallTstate(
152-
PyThreadState_GET(),
153-
func,
154-
std::ptr::null_mut(),
155-
0,
156-
std::ptr::null_mut(),
157-
)
158-
}
159-
160-
extern "C" {
161-
#[cfg(PyPy)]
162-
#[link_name = "_PyPyObject_CallNoArg"]
163-
pub fn _PyObject_CallNoArg(func: *mut PyObject) -> *mut PyObject;
164-
}
127+
// skipped private _PyObject_FastCallTstate
128+
// skipped private _PyObject_FastCall
129+
// skipped private _PyObject_CallNoArg
165130

166131
#[cfg(all(Py_3_8, not(PyPy)))]
167132
#[inline(always)]
@@ -287,14 +252,7 @@ pub const PY_ITERSEARCH_COUNT: c_int = 1;
287252
pub const PY_ITERSEARCH_INDEX: c_int = 2;
288253
pub const PY_ITERSEARCH_CONTAINS: c_int = 3;
289254

290-
extern "C" {
291-
#[cfg(not(any(PyPy, GraalPy)))]
292-
pub fn _PySequence_IterSearch(
293-
seq: *mut PyObject,
294-
obj: *mut PyObject,
295-
operation: c_int,
296-
) -> Py_ssize_t;
297-
}
255+
// skipped private _PySequence_IterSearch
298256

299257
// skipped _PyObject_RealIsInstance
300258
// skipped _PyObject_RealIsSubclass

pyo3-ffi/src/cpython/bytesobject.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use crate::object::*;
2-
use crate::Py_ssize_t;
32
#[cfg(not(Py_LIMITED_API))]
43
use std::ffi::c_char;
5-
use std::ffi::c_int;
64

75
#[cfg(not(any(PyPy, GraalPy, Py_LIMITED_API)))]
86
#[repr(C)]
@@ -19,10 +17,7 @@ pub struct PyBytesObject {
1917
#[cfg(any(PyPy, GraalPy, Py_LIMITED_API))]
2018
opaque_struct!(pub PyBytesObject);
2119

22-
extern "C" {
23-
#[cfg_attr(PyPy, link_name = "_PyPyBytes_Resize")]
24-
pub fn _PyBytes_Resize(bytes: *mut *mut PyObject, newsize: Py_ssize_t) -> c_int;
25-
}
20+
// skipped private _PyBytes_Resize
2621

2722
#[cfg(not(Py_LIMITED_API))]
2823
#[inline]

pyo3-ffi/src/cpython/ceval.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
use crate::cpython::pystate::Py_tracefunc;
2-
use crate::object::{freefunc, PyObject};
3-
use std::ffi::c_int;
2+
use crate::object::PyObject;
43

54
extern "C" {
6-
// skipped non-limited _PyEval_CallTracing
5+
// skipped private _PyEval_CallTracing
76

8-
#[cfg(not(Py_3_11))]
9-
pub fn _PyEval_EvalFrameDefault(arg1: *mut crate::PyFrameObject, exc: c_int) -> *mut PyObject;
7+
// skipped private _PyEval_EvalFrameDefault
108

11-
#[cfg(Py_3_11)]
12-
pub fn _PyEval_EvalFrameDefault(
13-
tstate: *mut crate::PyThreadState,
14-
frame: *mut crate::_PyInterpreterFrame,
15-
exc: c_int,
16-
) -> *mut crate::PyObject;
9+
// skipped private _PyEval_RequestCodeExtraIndex
1710

18-
pub fn _PyEval_RequestCodeExtraIndex(func: freefunc) -> c_int;
1911
pub fn PyEval_SetProfile(trace_func: Option<Py_tracefunc>, arg1: *mut PyObject);
2012
pub fn PyEval_SetTrace(trace_func: Option<Py_tracefunc>, arg1: *mut PyObject);
2113
}

pyo3-ffi/src/cpython/code.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,7 @@ extern "C" {
149149
names: *mut PyObject,
150150
lnotab: *mut PyObject,
151151
) -> *mut PyObject;
152-
pub fn _PyCode_GetExtra(
153-
code: *mut PyObject,
154-
index: Py_ssize_t,
155-
extra: *const *mut c_void,
156-
) -> c_int;
157-
pub fn _PyCode_SetExtra(code: *mut PyObject, index: Py_ssize_t, extra: *mut c_void) -> c_int;
152+
153+
// skipped private _Py_GetExtra
154+
// skipped private _Py_SetExtra
158155
}

pyo3-ffi/src/cpython/dictobject.rs

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::object::*;
22
use crate::pyport::Py_ssize_t;
3-
use std::ffi::c_int;
43

54
opaque_struct!(pub PyDictKeysObject);
65

@@ -33,25 +32,14 @@ extern "C" {
3332
// skipped _PyDict_GetItemIdWithError
3433
// skipped _PyDict_GetItemStringWithError
3534
// skipped PyDict_SetDefault
36-
pub fn _PyDict_SetItem_KnownHash(
37-
mp: *mut PyObject,
38-
key: *mut PyObject,
39-
item: *mut PyObject,
40-
hash: crate::Py_hash_t,
41-
) -> c_int;
35+
// skipped private _PyDict_SetItem_KnownHash
4236
// skipped _PyDict_DelItem_KnownHash
4337
// skipped _PyDict_DelItemIf
4438
// skipped _PyDict_NewKeysForClass
45-
pub fn _PyDict_Next(
46-
mp: *mut PyObject,
47-
pos: *mut Py_ssize_t,
48-
key: *mut *mut PyObject,
49-
value: *mut *mut PyObject,
50-
hash: *mut crate::Py_hash_t,
51-
) -> c_int;
39+
// skipped _PyDict_Next
5240
// skipped PyDict_GET_SIZE
5341
// skipped _PyDict_ContainsId
54-
pub fn _PyDict_NewPresized(minused: Py_ssize_t) -> *mut PyObject;
42+
// skipped _PyDict_NewPresized
5543
// skipped _PyDict_MaybeUntrack
5644
// skipped _PyDict_HasOnlyStringKeys
5745
// skipped _PyDict_KeysSize
@@ -71,13 +59,5 @@ extern "C" {
7159
// skipped _PyDictView_New
7260
// skipped _PyDictView_Intersect
7361

74-
#[cfg(Py_3_10)]
75-
pub fn _PyDict_Contains_KnownHash(
76-
op: *mut PyObject,
77-
key: *mut PyObject,
78-
hash: crate::Py_hash_t,
79-
) -> c_int;
80-
81-
#[cfg(not(Py_3_10))]
82-
pub fn _PyDict_Contains(mp: *mut PyObject, key: *mut PyObject, hash: Py_ssize_t) -> c_int;
62+
// skipped _PyDict_Contains_KnownHash
8363
}

pyo3-ffi/src/cpython/pyframe.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ use std::ffi::c_char;
66
use std::ffi::c_int;
77
use std::ptr::addr_of_mut;
88

9-
// NB used in `_PyEval_EvalFrameDefault`, maybe we remove this too.
10-
#[cfg(all(Py_3_11, not(PyPy)))]
11-
opaque_struct!(pub _PyInterpreterFrame);
9+
// skipped private _PyInterpreterFrame
1210

1311
#[cfg_attr(windows, link(name = "pythonXY"))]
1412
extern "C" {

pyo3-ffi/src/cpython/pystate.rs

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -70,33 +70,9 @@ extern "C" {
7070
pub fn PyThreadState_DeleteCurrent();
7171
}
7272

73-
#[cfg(all(Py_3_9, not(any(Py_3_11, PyPy))))]
74-
pub type _PyFrameEvalFunction = extern "C" fn(
75-
*mut crate::PyThreadState,
76-
*mut crate::PyFrameObject,
77-
c_int,
78-
) -> *mut crate::object::PyObject;
79-
80-
#[cfg(all(Py_3_11, not(PyPy)))]
81-
pub type _PyFrameEvalFunction = extern "C" fn(
82-
*mut crate::PyThreadState,
83-
*mut crate::_PyInterpreterFrame,
84-
c_int,
85-
) -> *mut crate::object::PyObject;
86-
87-
#[cfg(all(Py_3_9, not(PyPy)))]
88-
extern "C" {
89-
/// Get the frame evaluation function.
90-
fn _PyInterpreterState_GetEvalFrameFunc(
91-
interp: *mut PyInterpreterState,
92-
) -> _PyFrameEvalFunction;
93-
94-
///Set the frame evaluation function.
95-
fn _PyInterpreterState_SetEvalFrameFunc(
96-
interp: *mut PyInterpreterState,
97-
eval_frame: _PyFrameEvalFunction,
98-
);
99-
}
73+
// skipped private _PyFrameEvalFunction
74+
// skipped private _PyInterpreterState_GetEvalFrameFunc
75+
// skipped private _PyInterpreterState_SetEvalFrameFunc
10076

10177
// skipped _PyInterpreterState_GetConfig
10278
// skipped _PyInterpreterState_GetConfigCopy

pyo3-ffi/src/cpython/pythonrun.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::ffi::{c_char, c_int};
99

1010
extern "C" {
1111
pub fn PyRun_SimpleStringFlags(arg1: *const c_char, arg2: *mut PyCompilerFlags) -> c_int;
12-
pub fn _PyRun_SimpleFileObject(
12+
fn _PyRun_SimpleFileObject(
1313
fp: *mut FILE,
1414
filename: *mut PyObject,
1515
closeit: c_int,
@@ -21,7 +21,7 @@ extern "C" {
2121
closeit: c_int,
2222
flags: *mut PyCompilerFlags,
2323
) -> c_int;
24-
pub fn _PyRun_AnyFileObject(
24+
fn _PyRun_AnyFileObject(
2525
fp: *mut FILE,
2626
filename: *mut PyObject,
2727
closeit: c_int,
@@ -48,7 +48,7 @@ extern "C" {
4848
filename: *const c_char,
4949
flags: *mut PyCompilerFlags,
5050
) -> c_int;
51-
pub fn _PyRun_InteractiveLoopObject(
51+
fn _PyRun_InteractiveLoopObject(
5252
fp: *mut FILE,
5353
filename: *mut PyObject,
5454
flags: *mut PyCompilerFlags,

0 commit comments

Comments
 (0)