Use the num-traits crate directly instead of num

This commit is contained in:
Dmytro Meleshko
2019-12-03 19:30:45 +02:00
parent e69b548448
commit eb7ea5bec2
8 changed files with 10 additions and 13 deletions

View File

@@ -19,10 +19,7 @@ path = "src/sdl2/lib.rs"
bitflags = "^1"
libc = "^0.2"
lazy_static = "^1"
[dependencies.num]
version = "^0.1"
default-features = false
num-traits = "^0.2"
[dependencies.sdl2-sys]
path = "sdl2-sys"

View File

@@ -53,7 +53,7 @@
//! ```
use std::ffi::{CStr, CString};
use num::FromPrimitive;
use num_traits::FromPrimitive;
use libc::{c_int, c_void, c_char};
use std::ops::{Deref, DerefMut};
use std::path::Path;
@@ -810,13 +810,13 @@ impl AudioCVT {
//! the conversion in place; then it is passed to the SDL library.
//!
//! Certain conversions may cause buffer overflows. See AngryLawyer/rust-sdl2 issue #270.
use num::traits as num;
unsafe {
if self.raw.needed != 0 {
let mut raw = self.raw;
// calculate the size of the dst buffer
raw.len = num::cast(src.len()).expect("Buffer length overflow");
use std::convert::TryInto;
raw.len = src.len().try_into().expect("Buffer length overflow");
let dst_size = self.capacity(src.len());
let needed = dst_size - src.len();
src.reserve_exact(needed);

View File

@@ -5,7 +5,7 @@ Event Handling
use std::ffi::CStr;
use std::mem;
use libc::c_int;
use num::FromPrimitive;
use num_traits::FromPrimitive;
use std::ptr;
use std::borrow::ToOwned;
use std::iter::FromIterator;

View File

@@ -50,7 +50,7 @@
#![allow(clippy::cast_lossless, clippy::transmute_ptr_to_ref)]
extern crate num;
extern crate num_traits;
pub extern crate libc;
#[macro_use]

View File

@@ -1,4 +1,4 @@
use num::FromPrimitive;
use num_traits::FromPrimitive;
use std::mem::transmute;
use std::convert::TryFrom;
use crate::sys;

View File

@@ -46,7 +46,7 @@ use libc::{c_int, c_double};
use crate::rect::Point;
use crate::rect::Rect;
use std::ffi::CStr;
use num::FromPrimitive;
use num_traits::FromPrimitive;
use std::vec::Vec;
use crate::common::{validate_int, IntegerOrSdlError};
use std::mem::{transmute, MaybeUninit};

View File

@@ -8,7 +8,7 @@ use crate::rect::Rect;
use crate::get_error;
use std::ptr;
use libc::c_int;
use num::FromPrimitive;
use num_traits::FromPrimitive;
use crate::pixels;
use crate::render::{BlendMode, Canvas};
use crate::rwops::RWops;

View File

@@ -11,7 +11,7 @@ use crate::surface::SurfaceRef;
use crate::pixels::PixelFormatEnum;
use crate::VideoSubsystem;
use crate::EventPump;
use num::FromPrimitive;
use num_traits::FromPrimitive;
use crate::common::{validate_int, IntegerOrSdlError};
use crate::get_error;