Skip to content

std: Change hash to reexport its own Writer #14314

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 23, 2014
+4 −2
Merged

std: Change hash to reexport its own Writer #14314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/libstd/hash/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@

use container::Container;
use intrinsics::TypeId;
use io::Writer;
use iter::Iterator;
use option::{Option, Some, None};
use owned::Box;
Expand All @@ -78,6 +77,8 @@ use vec::Vec;
/// Reexport the `sip::hash` function as our default hasher.
pub use hash = self::sip::hash;

pub use Writer = io::Writer;

pub mod sip;

/// A trait that represents a hashable type. The `S` type parameter is an
Expand Down
3 changes: 2 additions & 1 deletion src/libsyntax/ext/deriving/hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ pub fn expand_deriving_hash(cx: &mut ExtCtxt,
vec!(box Literal(Path::new_local("__S"))), true),
LifetimeBounds {
lifetimes: Vec::new(),
bounds: vec!(("__S", ast::StaticSize, vec!(Path::new(vec!("std", "io", "Writer"))))),
bounds: vec!(("__S", ast::StaticSize,
vec!(Path::new(vec!("std", "hash", "Writer"))))),
},
Path::new_local("__S"))
} else {
Expand Down