nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 22:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conventions and cleanup for Bitv and BitvSet

Browse Source 
Part of #18424

This commit changes the semantics of `reserve` and `capacity` for Bitv and BitvSet to match conventions. It also introduces the notion of `reserve_index` and `reserve_index_exact` for collections with maximum-index-based capacity semantics.

Deprecates free function constructors in favour of functions on Bitv itself.

Changes `Bitv::pop` to return an Option rather than panicking.

Deprecates and renames several methods in favour of conventions.

Marks several blessed methods as unstable.

This commit also substantially refactors Bitv and BitvSet's implementations. The new implementation is simpler, cleaner, better documented, and more robust against overflows. It also reduces coupling between Bitv and BitvSet. Tests have been seperated into seperate submodules.

Fixes #16958

[breaking-change]
This commit is contained in:
Alexis Beingessner 2014-11-21 20:47:40 -05:00
parent 8f51ad2420
commit 9c5101542d
3 changed files with 860 additions and 691 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1545
src/libcollections/bit.rs
View File

File diff suppressed because it is too large Load Diff

4
src/test/run-pass/bitv-perf-test.rs
View File

@ -13,8 +13,8 @@ extern crate collections;
use std::collections::Bitv; use std::collections::Bitv;
fn bitv_test() { fn bitv_test() {
let mut v1 = box Bitv::with_capacity(31, false); let mut v1 = box Bitv::from_elem(31, false);
let v2 = box Bitv::with_capacity(31, true); let v2 = box Bitv::from_elem(31, true);
v1.union(&*v2); v1.union(&*v2);
} }

2
src/test/run-pass/issue-11736.rs
View File

@ -16,7 +16,7 @@ use std::num::Float;
fn main() { fn main() {
// Generate sieve of Eratosthenes for n up to 1e6 // Generate sieve of Eratosthenes for n up to 1e6
let n = 1000000u; let n = 1000000u;
let mut sieve = Bitv::with_capacity(n+1, true); let mut sieve = Bitv::from_elem(n+1, true);
let limit: uint = (n as f32).sqrt() as uint; let limit: uint = (n as f32).sqrt() as uint;
for i in range(2, limit+1) { for i in range(2, limit+1) {
if sieve[i] { if sieve[i] {