Skip to content

add #[experimental] as_string/as_vec functions #16713

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 26 additions & 2 deletions src/libcollections/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use hash;
use str;
use str::{CharRange, StrAllocating, MaybeOwned, Owned};
use str::Slice as MaybeOwnedSlice; // So many `Slice`s...
use vec::Vec;
use vec::{AsVec, Vec, as_vec};

/// A growable string stored as a UTF-8 encoded buffer.
#[deriving(Clone, PartialEq, PartialOrd, Eq, Ord)]
Expand Down Expand Up @@ -808,6 +808,24 @@ impl<S: Str> Add<S, String> for String {
}
}

/// Wrapper type providing a `&String` reference via `Deref`.
#[experimental]
pub struct AsString<'a> {
x: AsVec<'a, u8>
}

impl<'a> Deref<String> for AsString<'a> {
fn deref<'b>(&'b self) -> &'b String {
unsafe { mem::transmute(&*self.x) }
}
}

/// Convert a string slice to a wrapper type providing a `&String` reference.
#[experimental]
pub fn as_string<'a>(x: &'a str) -> AsString<'a> {
AsString { x: as_vec(x.as_bytes()) }
}

/// Unsafe operations
pub mod raw {
use core::mem;
Expand Down Expand Up @@ -873,9 +891,15 @@ mod tests {
use {Mutable, MutableSeq};
use str;
use str::{Str, StrSlice, Owned, Slice};
use super::String;
use super::{as_string, String};
use vec::Vec;

#[test]
fn test_as_string() {
let x = "foo";
assert_eq!(x, as_string(xs).as_slice());
}

#[test]
fn test_from_str() {
let owned: Option<::std::string::String> = from_str("string");
Expand Down
76 changes: 63 additions & 13 deletions src/libcollections/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use alloc::heap::{allocate, reallocate, deallocate};
use core::cmp::max;
use core::default::Default;
use core::fmt;
use core::kinds;
use core::mem;
use core::num;
use core::ptr;
Expand Down Expand Up @@ -750,7 +751,6 @@ impl<T> Vec<T> {
}
}


/// Sets the length of a vector.
///
/// This will explicitly set the size of the vector, without actually
Expand Down Expand Up @@ -1692,6 +1692,39 @@ pub fn unzip<T, U, V: Iterator<(T, U)>>(mut iter: V) -> (Vec<T>, Vec<U>) {
(ts, us)
}

/// Wrapper type providing a `&Vec<T>` reference via `Deref`.
#[experimental]
pub struct AsVec<'a, T> {
x: Vec<T>,
l: kinds::marker::ContravariantLifetime<'a>
}

impl<'a, T> Deref<Vec<T>> for AsVec<'a, T> {
fn deref<'b>(&'b self) -> &'b Vec<T> {
&self.x
}
}

// Prevent the inner `Vec<T>` from attempting to deallocate memory.
#[unsafe_destructor]
impl<'a, T> Drop for AsVec<'a, T> {
fn drop(&mut self) {
self.x.len = 0;
self.x.cap = 0;
}
}

/// Convert a slice to a wrapper type providing a `&Vec<T>` reference.
#[experimental]
pub fn as_vec<'a, T>(x: &'a [T]) -> AsVec<'a, T> {
unsafe {
AsVec {
x: Vec::from_raw_parts(x.len(), x.len(), x.as_ptr() as *mut T),
l: kinds::marker::ContravariantLifetime::<'a>
}
}
}

/// Unsafe vector operations.
pub mod raw {
use super::Vec;
Expand All @@ -1717,10 +1750,38 @@ mod tests {
use std::prelude::*;
use std::mem::size_of;
use test::Bencher;
use super::{unzip, raw, Vec};
use super::{as_vec, unzip, raw, Vec};

use MutableSeq;

struct DropCounter<'a> {
count: &'a mut int
}

#[unsafe_destructor]
impl<'a> Drop for DropCounter<'a> {
fn drop(&mut self) {
*self.count += 1;
}
}

#[test]
fn test_as_vec() {
let xs = &[1u8, 2u8, 3u8];
assert_eq!(xs, as_vec(xs).as_slice());
}

#[test]
fn test_as_vec_dtor() {
let (mut count_x, mut count_y) = (0, 0);
{
let xs = &[DropCounter { count: &mut count_x }, DropCounter { count: &mut count_y }];
assert_eq!(as_vec(xs).len(), 2);
}
assert_eq!(count_x, 1);
assert_eq!(count_y, 1);
}

#[test]
fn test_small_vec_struct() {
assert!(size_of::<Vec<u8>>() == size_of::<uint>() * 3);
Expand All @@ -1733,17 +1794,6 @@ mod tests {
y: Vec<T>
}

struct DropCounter<'a> {
count: &'a mut int
}

#[unsafe_destructor]
impl<'a> Drop for DropCounter<'a> {
fn drop(&mut self) {
*self.count += 1;
}
}

let (mut count_x, mut count_y) = (0, 0);
{
let mut tv = TwoVec {
Expand Down