Skip to content

Use 100% safe TinyVec instead of SmallVec #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
est31 merged 1 commit into from
Mar 16, 2020
Merged

Use 100% safe TinyVec instead of SmallVec #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ required-features = ["ogg"]

[dependencies]
byteorder = "1.0"
smallvec = "1.1"
tinyvec = { version = "0.3.2", features = ["alloc"] }
ogg = { version = "0.7", optional = true }
tokio-io = { version = "0.1", optional = true }
futures = { version = "0.1", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions src/audio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use std::error;
use std::fmt;
use std::cmp::min;
use std::iter;
use smallvec::SmallVec;
use tinyvec::TinyVec;
use ::ilog;
use ::bitpacking::BitpackCursor;
use ::header::{Codebook, Floor, FloorTypeZero, FloorTypeOne,
Expand Down Expand Up @@ -932,7 +932,7 @@ pub fn read_audio_packet_generic<S :Samples>(ident :&IdentHeader, setup :&SetupH
&setup.codebooks, &setup.floors));

// Now calculate the no_residue vector
let mut no_residue = SmallVec::<[bool; 256]>::new();
let mut no_residue = TinyVec::<[bool; 32]>::new();
for fl in &decoded_floor_infos {
no_residue.push(fl.is_unused());
}
Expand All @@ -950,7 +950,7 @@ pub fn read_audio_packet_generic<S :Samples>(ident :&IdentHeader, setup :&SetupH
// Helper variable
let resid_vec_len = (n / 2) as usize;
for (i, &residue_number) in mapping.mapping_submap_residues.iter().enumerate() {
let mut do_not_decode_flag = SmallVec::<[bool; 256]>::new();
let mut do_not_decode_flag = TinyVec::<[bool; 32]>::new();
for (j, &mapping_mux_j) in mapping.mapping_mux.iter().enumerate() {
if mapping_mux_j as usize == i {
do_not_decode_flag.push(no_residue[j]);
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ modules.
*/

extern crate byteorder;
extern crate smallvec;
extern crate tinyvec;
#[cfg(feature = "ogg")]
extern crate ogg;
#[cfg(feature = "async_ogg")]
Expand Down