From d223dd1e57cc412aa2eff28e6604f86b9f013083 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Fri, 21 Feb 2014 21:33:23 -0800 Subject: std: rewrite Hash to make it more generic This patch merges IterBytes and Hash traits, which clears up the confusion of using `#[deriving(IterBytes)]` to support hashing. Instead, it now is much easier to use the new `#[deriving(Hash)]` for making a type hashable with a stream hash. Furthermore, it supports custom non-stream-based hashers, such as if a value's hash was cached in a database. This does not yet replace the old IterBytes-hash with this new version. --- .../deriving-span-Hash-enum-struct-variant.rs | 27 +++++++++++++++++++++ src/test/compile-fail/deriving-span-Hash-enum.rs | 27 +++++++++++++++++++++ src/test/compile-fail/deriving-span-Hash-struct.rs | 25 +++++++++++++++++++ .../deriving-span-Hash-tuple-struct.rs | 25 +++++++++++++++++++ src/test/run-pass/deriving-hash.rs | 28 ++++++++++++++++++++++ src/test/run-pass/deriving-meta-multiple.rs | 2 ++ src/test/run-pass/deriving-meta.rs | 2 ++ src/test/run-pass/typeid-intrinsic.rs | 1 + 8 files changed, 137 insertions(+) create mode 100644 src/test/compile-fail/deriving-span-Hash-enum-struct-variant.rs create mode 100644 src/test/compile-fail/deriving-span-Hash-enum.rs create mode 100644 src/test/compile-fail/deriving-span-Hash-struct.rs create mode 100644 src/test/compile-fail/deriving-span-Hash-tuple-struct.rs create mode 100644 src/test/run-pass/deriving-hash.rs (limited to 'src/test') diff --git a/src/test/compile-fail/deriving-span-Hash-enum-struct-variant.rs b/src/test/compile-fail/deriving-span-Hash-enum-struct-variant.rs new file mode 100644 index 00000000000..182c669cbea --- /dev/null +++ b/src/test/compile-fail/deriving-span-Hash-enum-struct-variant.rs @@ -0,0 +1,27 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' + +#[feature(struct_variant)]; +extern crate extra; + +use std::hash::Hash; + +struct Error; + +#[deriving(Hash)] +enum Enum { + A { + x: Error //~ ERROR + } +} + +fn main() {} diff --git a/src/test/compile-fail/deriving-span-Hash-enum.rs b/src/test/compile-fail/deriving-span-Hash-enum.rs new file mode 100644 index 00000000000..7617e0a33c3 --- /dev/null +++ b/src/test/compile-fail/deriving-span-Hash-enum.rs @@ -0,0 +1,27 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' + +#[feature(struct_variant)]; +extern crate extra; + +use std::hash::Hash; + +struct Error; + +#[deriving(Hash)] +enum Enum { + A( + Error //~ ERROR + ) +} + +fn main() {} diff --git a/src/test/compile-fail/deriving-span-Hash-struct.rs b/src/test/compile-fail/deriving-span-Hash-struct.rs new file mode 100644 index 00000000000..f20da9a9d16 --- /dev/null +++ b/src/test/compile-fail/deriving-span-Hash-struct.rs @@ -0,0 +1,25 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' + +#[feature(struct_variant)]; +extern crate extra; + +use std::hash::Hash; + +struct Error; + +#[deriving(Hash)] +struct Struct { + x: Error //~ ERROR +} + +fn main() {} diff --git a/src/test/compile-fail/deriving-span-Hash-tuple-struct.rs b/src/test/compile-fail/deriving-span-Hash-tuple-struct.rs new file mode 100644 index 00000000000..9b7ae50b738 --- /dev/null +++ b/src/test/compile-fail/deriving-span-Hash-tuple-struct.rs @@ -0,0 +1,25 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// This file was auto-generated using 'src/etc/generate-keyword-span-tests.py' + +#[feature(struct_variant)]; +extern crate extra; + +use std::hash::Hash; + +struct Error; + +#[deriving(Hash)] +struct Struct( + Error //~ ERROR +); + +fn main() {} diff --git a/src/test/run-pass/deriving-hash.rs b/src/test/run-pass/deriving-hash.rs new file mode 100644 index 00000000000..087b7ce56ab --- /dev/null +++ b/src/test/run-pass/deriving-hash.rs @@ -0,0 +1,28 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// ignore-fast + +use std::hash; +use std::hash::Hash; + +#[deriving(Hash)] +struct Person { + id: uint, + name: ~str, + phone: uint, +} + +fn main() { + let person1 = Person { id: 5, name: ~"Janet", phone: 555_666_7777 }; + let person2 = Person { id: 5, name: ~"Bob", phone: 555_666_7777 }; + assert!(hash::hash(&person1) == hash::hash(&person1)); + assert!(hash::hash(&person1) != hash::hash(&person2)); +} diff --git a/src/test/run-pass/deriving-meta-multiple.rs b/src/test/run-pass/deriving-meta-multiple.rs index c65cae6d3b9..49bf101954b 100644 --- a/src/test/run-pass/deriving-meta-multiple.rs +++ b/src/test/run-pass/deriving-meta-multiple.rs @@ -10,6 +10,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use std::hash_old::Hash; + #[deriving(Eq)] #[deriving(Clone)] #[deriving(IterBytes)] diff --git a/src/test/run-pass/deriving-meta.rs b/src/test/run-pass/deriving-meta.rs index cbe54790404..93193fc9d65 100644 --- a/src/test/run-pass/deriving-meta.rs +++ b/src/test/run-pass/deriving-meta.rs @@ -10,6 +10,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use std::hash_old::Hash; + #[deriving(Eq, Clone, IterBytes)] struct Foo { bar: uint, diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/run-pass/typeid-intrinsic.rs index 71e19b51c72..2d5c1d100be 100644 --- a/src/test/run-pass/typeid-intrinsic.rs +++ b/src/test/run-pass/typeid-intrinsic.rs @@ -15,6 +15,7 @@ extern crate other1 = "typeid-intrinsic"; extern crate other2 = "typeid-intrinsic2"; +use std::hash_old::Hash; use std::unstable::intrinsics; use std::unstable::intrinsics::TypeId; -- cgit 1.4.1-3-g733a5