2014-05-17 16:46:40 -05:00
|
|
|
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2014-05-19 16:12:17 -05:00
|
|
|
//! The AST pointer
|
|
|
|
//!
|
2014-12-22 11:04:23 -06:00
|
|
|
//! Provides `P<T>`, a frozen owned smart pointer, as a replacement for `@T` in
|
|
|
|
//! the AST.
|
2014-05-19 16:12:17 -05:00
|
|
|
//!
|
|
|
|
//! # Motivations and benefits
|
|
|
|
//!
|
2014-12-22 11:04:23 -06:00
|
|
|
//! * **Identity**: sharing AST nodes is problematic for the various analysis
|
|
|
|
//! passes (e.g. one may be able to bypass the borrow checker with a shared
|
|
|
|
//! `ExprAddrOf` node taking a mutable borrow). The only reason `@T` in the
|
|
|
|
//! AST hasn't caused issues is because of inefficient folding passes which
|
|
|
|
//! would always deduplicate any such shared nodes. Even if the AST were to
|
|
|
|
//! switch to an arena, this would still hold, i.e. it couldn't use `&'a T`,
|
|
|
|
//! but rather a wrapper like `P<'a, T>`.
|
2014-05-19 16:12:17 -05:00
|
|
|
//!
|
|
|
|
//! * **Immutability**: `P<T>` disallows mutating its inner `T`, unlike `Box<T>`
|
|
|
|
//! (unless it contains an `Unsafe` interior, but that may be denied later).
|
|
|
|
//! This mainly prevents mistakes, but can also enforces a kind of "purity".
|
|
|
|
//!
|
|
|
|
//! * **Efficiency**: folding can reuse allocation space for `P<T>` and `Vec<T>`,
|
|
|
|
//! the latter even when the input and output types differ (as it would be the
|
|
|
|
//! case with arenas or a GADT AST using type parameters to toggle features).
|
|
|
|
//!
|
|
|
|
//! * **Maintainability**: `P<T>` provides a fixed interface - `Deref`,
|
|
|
|
//! `and_then` and `map` - which can remain fully functional even if the
|
|
|
|
//! implementation changes (using a special thread-local heap, for example).
|
|
|
|
//! Moreover, a switch to, e.g. `P<'a, T>` would be easy and mostly automated.
|
|
|
|
|
2015-01-20 17:45:07 -06:00
|
|
|
use std::fmt::{self, Display, Debug};
|
std: Stabilize the std::hash module
This commit aims to prepare the `std::hash` module for alpha by formalizing its
current interface whileholding off on adding `#[stable]` to the new APIs. The
current usage with the `HashMap` and `HashSet` types is also reconciled by
separating out composable parts of the design. The primary goal of this slight
redesign is to separate the concepts of a hasher's state from a hashing
algorithm itself.
The primary change of this commit is to separate the `Hasher` trait into a
`Hasher` and a `HashState` trait. Conceptually the old `Hasher` trait was
actually just a factory for various states, but hashing had very little control
over how these states were used. Additionally the old `Hasher` trait was
actually fairly unrelated to hashing.
This commit redesigns the existing `Hasher` trait to match what the notion of a
`Hasher` normally implies with the following definition:
trait Hasher {
type Output;
fn reset(&mut self);
fn finish(&self) -> Output;
}
This `Hasher` trait emphasizes that hashing algorithms may produce outputs other
than a `u64`, so the output type is made generic. Other than that, however, very
little is assumed about a particular hasher. It is left up to implementors to
provide specific methods or trait implementations to feed data into a hasher.
The corresponding `Hash` trait becomes:
trait Hash<H: Hasher> {
fn hash(&self, &mut H);
}
The old default of `SipState` was removed from this trait as it's not something
that we're willing to stabilize until the end of time, but the type parameter is
always required to implement `Hasher`. Note that the type parameter `H` remains
on the trait to enable multidispatch for specialization of hashing for
particular hashers.
Note that `Writer` is not mentioned in either of `Hash` or `Hasher`, it is
simply used as part `derive` and the implementations for all primitive types.
With these definitions, the old `Hasher` trait is realized as a new `HashState`
trait in the `collections::hash_state` module as an unstable addition for
now. The current definition looks like:
trait HashState {
type Hasher: Hasher;
fn hasher(&self) -> Hasher;
}
The purpose of this trait is to emphasize that the one piece of functionality
for implementors is that new instances of `Hasher` can be created. This
conceptually represents the two keys from which more instances of a
`SipHasher` can be created, and a `HashState` is what's stored in a
`HashMap`, not a `Hasher`.
Implementors of custom hash algorithms should implement the `Hasher` trait, and
only hash algorithms intended for use in hash maps need to implement or worry
about the `HashState` trait.
The entire module and `HashState` infrastructure remains `#[unstable]` due to it
being recently redesigned, but some other stability decision made for the
`std::hash` module are:
* The `Writer` trait remains `#[experimental]` as it's intended to be replaced
with an `io::Writer` (more details soon).
* The top-level `hash` function is `#[unstable]` as it is intended to be generic
over the hashing algorithm instead of hardwired to `SipHasher`
* The inner `sip` module is now private as its one export, `SipHasher` is
reexported in the `hash` module.
And finally, a few changes were made to the default parameters on `HashMap`.
* The `RandomSipHasher` default type parameter was renamed to `RandomState`.
This renaming emphasizes that it is not a hasher, but rather just state to
generate hashers. It also moves away from the name "sip" as it may not always
be implemented as `SipHasher`. This type lives in the
`std::collections::hash_map` module as `#[unstable]`
* The associated `Hasher` type of `RandomState` is creatively called...
`Hasher`! This concrete structure lives next to `RandomState` as an
implemenation of the "default hashing algorithm" used for a `HashMap`. Under
the hood this is currently implemented as `SipHasher`, but it draws an
explicit interface for now and allows us to modify the implementation over
time if necessary.
There are many breaking changes outlined above, and as a result this commit is
a:
[breaking-change]
2014-12-09 14:37:23 -06:00
|
|
|
use std::hash::{Hash, Hasher};
|
2014-12-22 11:04:23 -06:00
|
|
|
use std::ops::Deref;
|
2014-10-15 01:05:01 -05:00
|
|
|
use std::ptr;
|
std: Stabilize the std::hash module
This commit aims to prepare the `std::hash` module for alpha by formalizing its
current interface whileholding off on adding `#[stable]` to the new APIs. The
current usage with the `HashMap` and `HashSet` types is also reconciled by
separating out composable parts of the design. The primary goal of this slight
redesign is to separate the concepts of a hasher's state from a hashing
algorithm itself.
The primary change of this commit is to separate the `Hasher` trait into a
`Hasher` and a `HashState` trait. Conceptually the old `Hasher` trait was
actually just a factory for various states, but hashing had very little control
over how these states were used. Additionally the old `Hasher` trait was
actually fairly unrelated to hashing.
This commit redesigns the existing `Hasher` trait to match what the notion of a
`Hasher` normally implies with the following definition:
trait Hasher {
type Output;
fn reset(&mut self);
fn finish(&self) -> Output;
}
This `Hasher` trait emphasizes that hashing algorithms may produce outputs other
than a `u64`, so the output type is made generic. Other than that, however, very
little is assumed about a particular hasher. It is left up to implementors to
provide specific methods or trait implementations to feed data into a hasher.
The corresponding `Hash` trait becomes:
trait Hash<H: Hasher> {
fn hash(&self, &mut H);
}
The old default of `SipState` was removed from this trait as it's not something
that we're willing to stabilize until the end of time, but the type parameter is
always required to implement `Hasher`. Note that the type parameter `H` remains
on the trait to enable multidispatch for specialization of hashing for
particular hashers.
Note that `Writer` is not mentioned in either of `Hash` or `Hasher`, it is
simply used as part `derive` and the implementations for all primitive types.
With these definitions, the old `Hasher` trait is realized as a new `HashState`
trait in the `collections::hash_state` module as an unstable addition for
now. The current definition looks like:
trait HashState {
type Hasher: Hasher;
fn hasher(&self) -> Hasher;
}
The purpose of this trait is to emphasize that the one piece of functionality
for implementors is that new instances of `Hasher` can be created. This
conceptually represents the two keys from which more instances of a
`SipHasher` can be created, and a `HashState` is what's stored in a
`HashMap`, not a `Hasher`.
Implementors of custom hash algorithms should implement the `Hasher` trait, and
only hash algorithms intended for use in hash maps need to implement or worry
about the `HashState` trait.
The entire module and `HashState` infrastructure remains `#[unstable]` due to it
being recently redesigned, but some other stability decision made for the
`std::hash` module are:
* The `Writer` trait remains `#[experimental]` as it's intended to be replaced
with an `io::Writer` (more details soon).
* The top-level `hash` function is `#[unstable]` as it is intended to be generic
over the hashing algorithm instead of hardwired to `SipHasher`
* The inner `sip` module is now private as its one export, `SipHasher` is
reexported in the `hash` module.
And finally, a few changes were made to the default parameters on `HashMap`.
* The `RandomSipHasher` default type parameter was renamed to `RandomState`.
This renaming emphasizes that it is not a hasher, but rather just state to
generate hashers. It also moves away from the name "sip" as it may not always
be implemented as `SipHasher`. This type lives in the
`std::collections::hash_map` module as `#[unstable]`
* The associated `Hasher` type of `RandomState` is creatively called...
`Hasher`! This concrete structure lives next to `RandomState` as an
implemenation of the "default hashing algorithm" used for a `HashMap`. Under
the hood this is currently implemented as `SipHasher`, but it draws an
explicit interface for now and allows us to modify the implementation over
time if necessary.
There are many breaking changes outlined above, and as a result this commit is
a:
[breaking-change]
2014-12-09 14:37:23 -06:00
|
|
|
|
2014-05-17 16:46:40 -05:00
|
|
|
use serialize::{Encodable, Decodable, Encoder, Decoder};
|
|
|
|
|
|
|
|
/// An owned smart pointer.
|
|
|
|
pub struct P<T> {
|
|
|
|
ptr: Box<T>
|
|
|
|
}
|
|
|
|
|
|
|
|
#[allow(non_snake_case)]
|
2014-05-19 16:12:17 -05:00
|
|
|
/// Construct a `P<T>` from a `T` value.
|
2014-05-17 16:46:40 -05:00
|
|
|
pub fn P<T: 'static>(value: T) -> P<T> {
|
|
|
|
P {
|
|
|
|
ptr: box value
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: 'static> P<T> {
|
2014-05-19 16:12:17 -05:00
|
|
|
/// Move out of the pointer.
|
|
|
|
/// Intended for chaining transformations not covered by `map`.
|
2014-12-08 12:28:32 -06:00
|
|
|
pub fn and_then<U, F>(self, f: F) -> U where
|
|
|
|
F: FnOnce(T) -> U,
|
|
|
|
{
|
2014-05-17 16:46:40 -05:00
|
|
|
f(*self.ptr)
|
|
|
|
}
|
|
|
|
|
2014-05-19 16:12:17 -05:00
|
|
|
/// Transform the inner value, consuming `self` and producing a new `P<T>`.
|
2014-12-08 12:28:32 -06:00
|
|
|
pub fn map<F>(mut self, f: F) -> P<T> where
|
|
|
|
F: FnOnce(T) -> T,
|
|
|
|
{
|
2014-05-19 04:11:06 -05:00
|
|
|
unsafe {
|
|
|
|
let p = &mut *self.ptr;
|
|
|
|
// FIXME(#5016) this shouldn't need to zero to be safe.
|
2014-10-15 01:05:01 -05:00
|
|
|
ptr::write(p, f(ptr::read_and_zero(p)));
|
2014-05-19 04:11:06 -05:00
|
|
|
}
|
|
|
|
self
|
2014-05-17 16:46:40 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-01 13:53:20 -06:00
|
|
|
impl<T> Deref for P<T> {
|
|
|
|
type Target = T;
|
|
|
|
|
2014-05-17 16:46:40 -05:00
|
|
|
fn deref<'a>(&'a self) -> &'a T {
|
|
|
|
&*self.ptr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: 'static + Clone> Clone for P<T> {
|
|
|
|
fn clone(&self) -> P<T> {
|
|
|
|
P((**self).clone())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: PartialEq> PartialEq for P<T> {
|
|
|
|
fn eq(&self, other: &P<T>) -> bool {
|
|
|
|
**self == **other
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Eq> Eq for P<T> {}
|
|
|
|
|
2015-01-20 17:45:07 -06:00
|
|
|
impl<T: Debug> Debug for P<T> {
|
2014-05-17 16:46:40 -05:00
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
2015-01-20 17:45:07 -06:00
|
|
|
Debug::fmt(&**self, f)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
impl<T: Display> Display for P<T> {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
Display::fmt(&**self, f)
|
2014-05-17 16:46:40 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
std: Stabilize the std::hash module
This commit aims to prepare the `std::hash` module for alpha by formalizing its
current interface whileholding off on adding `#[stable]` to the new APIs. The
current usage with the `HashMap` and `HashSet` types is also reconciled by
separating out composable parts of the design. The primary goal of this slight
redesign is to separate the concepts of a hasher's state from a hashing
algorithm itself.
The primary change of this commit is to separate the `Hasher` trait into a
`Hasher` and a `HashState` trait. Conceptually the old `Hasher` trait was
actually just a factory for various states, but hashing had very little control
over how these states were used. Additionally the old `Hasher` trait was
actually fairly unrelated to hashing.
This commit redesigns the existing `Hasher` trait to match what the notion of a
`Hasher` normally implies with the following definition:
trait Hasher {
type Output;
fn reset(&mut self);
fn finish(&self) -> Output;
}
This `Hasher` trait emphasizes that hashing algorithms may produce outputs other
than a `u64`, so the output type is made generic. Other than that, however, very
little is assumed about a particular hasher. It is left up to implementors to
provide specific methods or trait implementations to feed data into a hasher.
The corresponding `Hash` trait becomes:
trait Hash<H: Hasher> {
fn hash(&self, &mut H);
}
The old default of `SipState` was removed from this trait as it's not something
that we're willing to stabilize until the end of time, but the type parameter is
always required to implement `Hasher`. Note that the type parameter `H` remains
on the trait to enable multidispatch for specialization of hashing for
particular hashers.
Note that `Writer` is not mentioned in either of `Hash` or `Hasher`, it is
simply used as part `derive` and the implementations for all primitive types.
With these definitions, the old `Hasher` trait is realized as a new `HashState`
trait in the `collections::hash_state` module as an unstable addition for
now. The current definition looks like:
trait HashState {
type Hasher: Hasher;
fn hasher(&self) -> Hasher;
}
The purpose of this trait is to emphasize that the one piece of functionality
for implementors is that new instances of `Hasher` can be created. This
conceptually represents the two keys from which more instances of a
`SipHasher` can be created, and a `HashState` is what's stored in a
`HashMap`, not a `Hasher`.
Implementors of custom hash algorithms should implement the `Hasher` trait, and
only hash algorithms intended for use in hash maps need to implement or worry
about the `HashState` trait.
The entire module and `HashState` infrastructure remains `#[unstable]` due to it
being recently redesigned, but some other stability decision made for the
`std::hash` module are:
* The `Writer` trait remains `#[experimental]` as it's intended to be replaced
with an `io::Writer` (more details soon).
* The top-level `hash` function is `#[unstable]` as it is intended to be generic
over the hashing algorithm instead of hardwired to `SipHasher`
* The inner `sip` module is now private as its one export, `SipHasher` is
reexported in the `hash` module.
And finally, a few changes were made to the default parameters on `HashMap`.
* The `RandomSipHasher` default type parameter was renamed to `RandomState`.
This renaming emphasizes that it is not a hasher, but rather just state to
generate hashers. It also moves away from the name "sip" as it may not always
be implemented as `SipHasher`. This type lives in the
`std::collections::hash_map` module as `#[unstable]`
* The associated `Hasher` type of `RandomState` is creatively called...
`Hasher`! This concrete structure lives next to `RandomState` as an
implemenation of the "default hashing algorithm" used for a `HashMap`. Under
the hood this is currently implemented as `SipHasher`, but it draws an
explicit interface for now and allows us to modify the implementation over
time if necessary.
There are many breaking changes outlined above, and as a result this commit is
a:
[breaking-change]
2014-12-09 14:37:23 -06:00
|
|
|
impl<S: Hasher, T: Hash<S>> Hash<S> for P<T> {
|
2014-05-17 16:46:40 -05:00
|
|
|
fn hash(&self, state: &mut S) {
|
|
|
|
(**self).hash(state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-04 00:24:50 -06:00
|
|
|
impl<T: 'static + Decodable> Decodable for P<T> {
|
|
|
|
fn decode<D: Decoder>(d: &mut D) -> Result<P<T>, D::Error> {
|
|
|
|
Decodable::decode(d).map(P)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Encodable> Encodable for P<T> {
|
|
|
|
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
|
|
|
|
(**self).encode(s)
|
|
|
|
}
|
|
|
|
}
|