2014-02-21 21:33:23 -08: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.
|
|
|
|
|
|
|
|
use ast::{MetaItem, Item, Expr, MutMutable};
|
|
|
|
use codemap::Span;
|
|
|
|
use ext::base::ExtCtxt;
|
|
|
|
use ext::build::AstBuilder;
|
|
|
|
use ext::deriving::generic::*;
|
2014-05-29 12:19:05 +09:00
|
|
|
use ext::deriving::generic::ty::*;
|
2014-04-23 22:43:45 +08:00
|
|
|
use parse::token::InternedString;
|
2014-09-13 19:06:01 +03:00
|
|
|
use ptr::P;
|
2014-05-16 00:16:13 -07:00
|
|
|
|
2014-12-08 13:28:32 -05:00
|
|
|
pub fn expand_deriving_hash<F>(cx: &mut ExtCtxt,
|
|
|
|
span: Span,
|
|
|
|
mitem: &MetaItem,
|
|
|
|
item: &Item,
|
|
|
|
push: F) where
|
|
|
|
F: FnOnce(P<Item>),
|
|
|
|
{
|
2014-02-21 21:33:23 -08:00
|
|
|
|
2015-01-05 17:07:16 +11:00
|
|
|
let path = Path::new_(vec!("std", "hash", "Hash"), None,
|
|
|
|
vec!(box Literal(Path::new_local("__S"))), true);
|
|
|
|
let generics = LifetimeBounds {
|
|
|
|
lifetimes: Vec::new(),
|
|
|
|
bounds: vec!(("__S",
|
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 12:37:23 -08:00
|
|
|
vec!(Path::new(vec!("std", "hash", "Writer")),
|
|
|
|
Path::new(vec!("std", "hash", "Hasher"))))),
|
2014-02-28 23:17:38 -08:00
|
|
|
};
|
2015-01-05 17:07:16 +11:00
|
|
|
let args = Path::new_local("__S");
|
2014-04-23 22:43:45 +08:00
|
|
|
let inline = cx.meta_word(span, InternedString::new("inline"));
|
|
|
|
let attrs = vec!(cx.attribute(span, inline));
|
2014-02-21 21:33:23 -08:00
|
|
|
let hash_trait_def = TraitDef {
|
|
|
|
span: span,
|
2014-02-28 13:09:09 -08:00
|
|
|
attributes: Vec::new(),
|
2014-02-28 23:17:38 -08:00
|
|
|
path: path,
|
2014-02-28 13:09:09 -08:00
|
|
|
additional_bounds: Vec::new(),
|
2014-02-28 23:17:38 -08:00
|
|
|
generics: generics,
|
2014-02-28 13:09:09 -08:00
|
|
|
methods: vec!(
|
2014-02-21 21:33:23 -08:00
|
|
|
MethodDef {
|
|
|
|
name: "hash",
|
|
|
|
generics: LifetimeBounds::empty(),
|
|
|
|
explicit_self: borrowed_explicit_self(),
|
2014-04-25 01:08:02 -07:00
|
|
|
args: vec!(Ptr(box Literal(args), Borrowed(None, MutMutable))),
|
2014-02-21 21:33:23 -08:00
|
|
|
ret_ty: nil_ty(),
|
2014-04-23 22:43:45 +08:00
|
|
|
attributes: attrs,
|
2015-01-01 18:32:49 -05:00
|
|
|
combine_substructure: combine_substructure(box |a, b, c| {
|
2014-04-21 23:25:18 -07:00
|
|
|
hash_substructure(a, b, c)
|
|
|
|
})
|
2014-02-21 21:33:23 -08:00
|
|
|
}
|
2014-02-28 13:09:09 -08:00
|
|
|
)
|
2014-02-21 21:33:23 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
hash_trait_def.expand(cx, mitem, item, push);
|
|
|
|
}
|
|
|
|
|
2014-09-13 19:06:01 +03:00
|
|
|
fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P<Expr> {
|
2014-02-21 21:33:23 -08:00
|
|
|
let state_expr = match substr.nonself_args {
|
2014-09-13 19:06:01 +03:00
|
|
|
[ref state_expr] => state_expr,
|
2015-01-14 18:56:17 -05:00
|
|
|
_ => cx.span_bug(trait_span, "incorrect number of arguments in `derive(Hash)`")
|
2014-02-21 21:33:23 -08:00
|
|
|
};
|
2014-12-30 21:02:53 -05:00
|
|
|
let call_hash = |&: span, thing_expr| {
|
2015-01-14 20:03:17 -05:00
|
|
|
let hash_path = {
|
|
|
|
let strs = vec![
|
|
|
|
cx.ident_of("std"),
|
|
|
|
cx.ident_of("hash"),
|
|
|
|
cx.ident_of("Hash"),
|
|
|
|
cx.ident_of("hash"),
|
|
|
|
];
|
|
|
|
|
|
|
|
cx.expr_path(cx.path_global(span, strs))
|
|
|
|
};
|
2015-01-14 18:22:16 -05:00
|
|
|
let ref_thing = cx.expr_addr_of(span, thing_expr);
|
2015-01-14 20:03:17 -05:00
|
|
|
let expr = cx.expr_call(span, hash_path, vec!(ref_thing, state_expr.clone()));
|
2014-02-21 21:33:23 -08:00
|
|
|
cx.stmt_expr(expr)
|
|
|
|
};
|
2014-02-28 13:09:09 -08:00
|
|
|
let mut stmts = Vec::new();
|
2014-02-21 21:33:23 -08:00
|
|
|
|
|
|
|
let fields = match *substr.fields {
|
|
|
|
Struct(ref fs) => fs,
|
|
|
|
EnumMatching(index, variant, ref fs) => {
|
|
|
|
// Determine the discriminant. We will feed this value to the byte
|
|
|
|
// iteration function.
|
|
|
|
let discriminant = match variant.node.disr_expr {
|
2014-09-13 19:06:01 +03:00
|
|
|
Some(ref d) => d.clone(),
|
2014-02-21 21:33:23 -08:00
|
|
|
None => cx.expr_uint(trait_span, index)
|
|
|
|
};
|
|
|
|
|
|
|
|
stmts.push(call_hash(trait_span, discriminant));
|
|
|
|
|
|
|
|
fs
|
|
|
|
}
|
2015-01-14 18:56:17 -05:00
|
|
|
_ => cx.span_bug(trait_span, "impossible substructure in `derive(Hash)`")
|
2014-02-21 21:33:23 -08:00
|
|
|
};
|
|
|
|
|
2014-09-13 19:06:01 +03:00
|
|
|
for &FieldInfo { ref self_, span, .. } in fields.iter() {
|
|
|
|
stmts.push(call_hash(span, self_.clone()));
|
2014-02-21 21:33:23 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
cx.expr_block(cx.block(trait_span, stmts, None))
|
|
|
|
}
|