luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We only need num-traits, not the full num crate.

This commit is contained in:
Daniel Grunwald 2016-04-17 23:35:17 +02:00
parent fffcf57834
commit 9aec3f33f1
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -26,7 +26,7 @@ build = "build.rs"
[dependencies]
libc = "0.2"
num = "0.1"
num-traits = "0.1"
# These features are both optional, but you must pick one to
# indicate which python ffi you are trying to bind to.

4
src/lib.rs
View File

@ -25,9 +25,9 @@
const_fn, // for GILProtected::new (#24111)
shared, // for std::ptr::Shared (#27730)
//recover, // for converting panics to python exceptions (#27719)
// -- TODO wait for stable release and promote recover code from cfg(nightly)
// -- TODO wait for stable release and promote recover code from cfg(nightly) (1.9?)
// -- TODO remove <DUMMY> hack when it's no longer necessary on stable
// -- TODO remove <DUMMY> hack when it's no longer necessary on stable (1.9?)
))]
#![allow(unused_imports)] // because some imports are only necessary with python 2.x or 3.x

11
src/objects/num.rs
View File

@ -16,8 +16,9 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
extern crate num;
extern crate num_traits;
use self::num_traits::cast::cast;
use libc::{c_long, c_double};
use python::{Python, PythonObject, PyClone};
use err::{self, PyResult, PyErr};
@ -123,7 +124,7 @@ macro_rules! int_fits_c_long(
if val == -1 && PyErr::occurred(py) {
return Err(PyErr::fetch(py));
}
match num::traits::cast::<c_long, $rust_type>(val) {
match cast::<c_long, $rust_type>(val) {
Some(v) => Ok(v),
None => Err(overflow_error(py))
}
@ -145,7 +146,7 @@ macro_rules! int_fits_larger_int(
extract!(obj to $rust_type; py => {
let val = try!(obj.extract::<$larger_type>(py));
match num::traits::cast::<$larger_type, $rust_type>(val) {
match cast::<$larger_type, $rust_type>(val) {
Some(v) => Ok(v),
None => Err(overflow_error(py))
}
@ -176,7 +177,7 @@ macro_rules! int_convert_u64_or_i64 (
#[cfg(feature="python27-sys")]
fn to_py_object(&self, py: Python) -> PyObject {
unsafe {
let ptr = match num::traits::cast::<$rust_type, c_long>(*self) {
let ptr = match cast::<$rust_type, c_long>(*self) {
Some(v) => ffi::PyInt_FromLong(v),
None => $pylong_from_ll_or_ull(*self)
};
@ -208,7 +209,7 @@ macro_rules! int_convert_u64_or_i64 (
if ffi::PyLong_Check(ptr) != 0 {
err_if_invalid_value(py, !0, $pylong_as_ull_or_ull(ptr))
} else if ffi::PyInt_Check(ptr) != 0 {
match num::traits::cast::<c_long, $rust_type>(ffi::PyInt_AS_LONG(ptr)) {
match cast::<c_long, $rust_type>(ffi::PyInt_AS_LONG(ptr)) {
Some(v) => Ok(v),
None => Err(overflow_error(py))
}