Skip to content

Commit

Permalink
core: Mark some functions as pure
Browse files Browse the repository at this point in the history
  • Loading branch information
cpeterso committed Dec 23, 2012
1 parent 50bb838 commit 6d8621a
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 16 deletions.
6 changes: 3 additions & 3 deletions src/libcore/dvec.rs
Expand Up @@ -67,17 +67,17 @@ pub pure fn DVec<A>() -> DVec<A> {
}

/// Creates a new dvec with a single element
pub fn from_elem<A>(e: A) -> DVec<A> {
pub pure fn from_elem<A>(e: A) -> DVec<A> {
DVec {mut data: ~[move e]}
}

/// Creates a new dvec with the contents of a vector
pub fn from_vec<A>(v: ~[A]) -> DVec<A> {
pub pure fn from_vec<A>(v: ~[A]) -> DVec<A> {
DVec {mut data: move v}
}

/// Consumes the vector and returns its contents
pub fn unwrap<A>(d: DVec<A>) -> ~[A] {
pub pure fn unwrap<A>(d: DVec<A>) -> ~[A] {
let DVec {data: v} = move d;
move v
}
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/float.rs
Expand Up @@ -188,7 +188,7 @@ pub pure fn to_str_common(num: float, digits: uint, exact: bool) -> ~str {
* * num - The float value
* * digits - The number of significant digits
*/
pub fn to_str_exact(num: float, digits: uint) -> ~str {
pub pure fn to_str_exact(num: float, digits: uint) -> ~str {
to_str_common(num, digits, true)
}

Expand Down Expand Up @@ -238,7 +238,7 @@ pub pure fn to_str(num: float, digits: uint) -> ~str {
* `none` if the string did not represent a valid number. Otherwise,
* `Some(n)` where `n` is the floating-point number represented by `[num]`.
*/
pub fn from_str(num: &str) -> Option<float> {
pub pure fn from_str(num: &str) -> Option<float> {
if num == "inf" {
return Some(infinity as float);
} else if num == "-inf" {
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/int-template/int.rs
Expand Up @@ -17,12 +17,12 @@ mod inst {
pub const bits: uint = uint::bits;

/// Returns `base` raised to the power of `exponent`
pub fn pow(base: int, exponent: uint) -> int {
pub pure fn pow(base: int, exponent: uint) -> int {
if exponent == 0u {
//Not mathemtically true if ~[base == 0]
return 1;
}
if base == 0 { return 0; }
if base == 0 { return 0; }
let mut my_pow = exponent;
let mut acc = 1;
let mut multiplier = base;
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/ptr.rs
Expand Up @@ -170,13 +170,13 @@ pub pure fn to_mut_unsafe_ptr<T>(thing: &mut T) -> *mut T {
(I couldn't think of a cutesy name for this one.)
*/
#[inline(always)]
pub fn to_uint<T>(thing: &T) -> uint unsafe {
pub pure fn to_uint<T>(thing: &T) -> uint unsafe {
cast::reinterpret_cast(&thing)
}

/// Determine if two borrowed pointers point to the same thing.
#[inline(always)]
pub fn ref_eq<T>(thing: &a/T, other: &b/T) -> bool {
pub pure fn ref_eq<T>(thing: &a/T, other: &b/T) -> bool {
to_uint(thing) == to_uint(other)
}

Expand Down
4 changes: 2 additions & 2 deletions src/libcore/rand.rs
Expand Up @@ -309,12 +309,12 @@ impl XorShiftState: Rng {
}
}

pub fn xorshift() -> Rng {
pub pure fn xorshift() -> Rng {
// constants taken from http://en.wikipedia.org/wiki/Xorshift
seeded_xorshift(123456789u32, 362436069u32, 521288629u32, 88675123u32)
}

pub fn seeded_xorshift(x: u32, y: u32, z: u32, w: u32) -> Rng {
pub pure fn seeded_xorshift(x: u32, y: u32, z: u32, w: u32) -> Rng {
{mut x: x, mut y: y, mut z: z, mut w: w} as Rng
}

Expand Down
6 changes: 2 additions & 4 deletions src/libcore/str.rs
Expand Up @@ -214,7 +214,7 @@ pub pure fn connect(v: &[~str], sep: &str) -> ~str {
}

/// Given a string, make a new string with repeated copies of it
pub fn repeat(ss: &str, nn: uint) -> ~str {
pub pure fn repeat(ss: &str, nn: uint) -> ~str {
let mut acc = ~"";
for nn.times { acc += ss; }
acc
Expand Down Expand Up @@ -1684,9 +1684,7 @@ pub struct CharRange {
*
* This function can be used to iterate over a unicode string in reverse.
*/
pure fn char_range_at_reverse(ss: &str, start: uint)
-> CharRange {

pure fn char_range_at_reverse(ss: &str, start: uint) -> CharRange {
let mut prev = start;

// while there is a previous byte == 10......
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/uint-template/uint.rs
Expand Up @@ -104,7 +104,7 @@ mod inst {

/// Returns the smallest power of 2 greater than or equal to `n`
#[inline(always)]
pub fn next_power_of_two(n: uint) -> uint {
pub pure fn next_power_of_two(n: uint) -> uint {
let halfbits: uint = sys::size_of::<uint>() * 4u;
let mut tmp: uint = n - 1u;
let mut shift: uint = 1u;
Expand Down

0 comments on commit 6d8621a

Please sign in to comment.