Skip to content

support deriving Hash for nullary structs #21162

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.

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
Jan 16, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions src/libsyntax/ext/deriving/hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub fn expand_deriving_hash<F>(cx: &mut ExtCtxt,
fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P<Expr> {
let state_expr = match substr.nonself_args {
[ref state_expr] => state_expr,
_ => cx.span_bug(trait_span, "incorrect number of arguments in `deriving(Hash)`")
_ => cx.span_bug(trait_span, "incorrect number of arguments in `derive(Hash)`")
};
let hash_ident = substr.method_ident;
let call_hash = |&: span, thing_expr| {
Expand All @@ -86,16 +86,12 @@ fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure)

fs
}
_ => cx.span_bug(trait_span, "impossible substructure in `deriving(Hash)`")
_ => cx.span_bug(trait_span, "impossible substructure in `derive(Hash)`")
};

for &FieldInfo { ref self_, span, .. } in fields.iter() {
stmts.push(call_hash(span, self_.clone()));
}

if stmts.len() == 0 {
cx.span_bug(trait_span, "#[derive(Hash)] needs at least one field");
}

cx.expr_block(cx.block(trait_span, stmts, None))
}
18 changes: 18 additions & 0 deletions src/test/run-pass/issue-16530.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2015 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 std::hash::{SipHasher, hash};

#[derive(Hash)]
struct Empty;

pub fn main() {
assert!(hash::<_, SipHasher>(&Empty) == hash::<_, SipHasher>(&Empty));
}