Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
proximity
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mathis "what could possibly go wrong" Randl
proximity
Commits
6eecd7e9
Commit
6eecd7e9
authored
2 months ago
by
Mathis "what could possibly go wrong" Randl
Browse files
Options
Downloads
Patches
Plain Diff
add clippy and fmt to bindings as well
parent
d34ab6a1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+6
-3
6 additions, 3 deletions
.gitlab-ci.yml
bindings/src/api.rs
+15
-12
15 additions, 12 deletions
bindings/src/api.rs
with
21 additions
and
15 deletions
.gitlab-ci.yml
+
6
−
3
View file @
6eecd7e9
...
...
@@ -14,13 +14,16 @@ run-tests-debug:
clippy
:
script
:
-
cd core
-
rustup component add clippy
-
cd core
-
cargo clippy
-
cd ../bindings
-
cargo clippy
format-check
:
script
:
-
cd core
-
rustup component add rustfmt
-
cd core
-
cargo fmt -- --check
-
cd ../bindings
-
cargo fmt -- --check
This diff is collapsed.
Click to expand it.
bindings/src/api.rs
+
15
−
12
View file @
6eecd7e9
use
proximipy
::
caching
::
approximate_cache
::
ApproximateCache
;
use
proximipy
::
caching
::
bounded
::
bounded_linear_cache
::
BoundedLinearCache
;
use
pyo3
::{
pyclass
,
pymethods
,
types
::{
PyAnyMethods
,
PyList
},
Bound
,
FromPyObject
,
IntoPyObject
,
PyErr
};
use
pyo3
::{
pyclass
,
pymethods
,
types
::{
PyAnyMethods
,
PyList
},
Bound
,
FromPyObject
,
IntoPyObject
,
PyErr
,
};
macro_rules!
create_pythonized_interface
{
(
$name
:
ident
,
$keytype
:
ident
,
$valuetype
:
ident
)
=>
{
...
...
@@ -46,42 +50,41 @@ macro_rules! create_pythonized_interface {
};
}
struct
F32VecPy
{
inner
:
Vec
<
f32
>
inner
:
Vec
<
f32
>
,
}
/// Explain to Rust how to parse some random python object into an actual Rust vector
/// This involves new allocations because Python cannot be trusted to keep this
/// reference alive.
///
///
/// This can fail if the random object in question is not a list of numbers,
/// in which case it is automatically reported by raising a TypeError exception
/// in which case it is automatically reported by raising a TypeError exception
/// in the Python code
impl
<
'a
>
FromPyObject
<
'a
>
for
F32VecPy
{
impl
<
'a
>
FromPyObject
<
'a
>
for
F32VecPy
{
fn
extract_bound
(
ob
:
&
pyo3
::
Bound
<
'a
,
pyo3
::
PyAny
>
)
->
pyo3
::
PyResult
<
Self
>
{
let
list
:
Vec
<
f32
>
=
ob
.downcast
::
<
PyList
>
()
?
.extract
()
?
;
Ok
(
F32VecPy
{
inner
:
list
})
let
list
:
Vec
<
f32
>
=
ob
.downcast
::
<
PyList
>
()
?
.extract
()
?
;
Ok
(
F32VecPy
{
inner
:
list
})
}
}
// Cast back the list of floats to a Python list
impl
<
'a
>
IntoPyObject
<
'a
>
for
F32VecPy
{
impl
<
'a
>
IntoPyObject
<
'a
>
for
F32VecPy
{
type
Target
=
PyList
;
type
Output
=
Bound
<
'a
,
PyList
>
;
type
Error
=
PyErr
;
fn
into_pyobject
(
self
,
py
:
pyo3
::
Python
<
'a
>
)
->
Result
<
Self
::
Output
,
Self
::
Error
>
{
let
internal
=
self
.inner
;
PyList
::
new
(
py
,
internal
)
PyList
::
new
(
py
,
internal
)
}
}
impl
Clone
for
F32VecPy
{
fn
clone
(
&
self
)
->
Self
{
F32VecPy
{
inner
:
self
.inner
.clone
()
inner
:
self
.inner
.clone
()
,
}
}
}
create_pythonized_interface!
(
I16ToVectorCache
,
i16
,
F32VecPy
);
\ No newline at end of file
create_pythonized_interface!
(
I16ToVectorCache
,
i16
,
F32VecPy
);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment