From 59e9cfa0cf66b92c05dc19c28dc6eb95cf2e4a67 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 14 Jan 2015 18:22:16 -0500 Subject: [PATCH 1/3] use UFCS in `#[deriving(Hash)]` expansion now uses `::std::hash::Hash::hash(&*__self_0_0, __arg_0)` instead of `(*__self_0_0).hash(__arg_0)` closes #21160 --- src/libcollections/btree/set.rs | 2 ++ src/libstd/io/process.rs | 2 ++ src/libsyntax/ext/deriving/hash.rs | 14 ++++++++++++-- src/test/compile-fail/issue-21160.rs | 21 +++++++++++++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 src/test/compile-fail/issue-21160.rs diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs index 812cff6fab7..6e048e0e83c 100644 --- a/src/libcollections/btree/set.rs +++ b/src/libcollections/btree/set.rs @@ -18,6 +18,8 @@ use core::cmp::Ordering::{self, Less, Greater, Equal}; use core::default::Default; use core::fmt::Show; use core::fmt; +// NOTE(stage0) remove import after a snapshot +#[cfg(stage0)] use core::hash::Hash; use core::iter::{Peekable, Map, FromIterator}; use core::ops::{BitOr, BitAnd, BitXor, Sub}; diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index a093e748d57..43ca7b13145 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -21,6 +21,8 @@ use prelude::v1::*; use collections::HashMap; use ffi::CString; use fmt; +// NOTE(stage0) remove import after a snapshot +#[cfg(stage0)] use hash::Hash; use io::pipe::{PipeStream, PipePair}; use io::{IoResult, IoError}; diff --git a/src/libsyntax/ext/deriving/hash.rs b/src/libsyntax/ext/deriving/hash.rs index db99c142443..98b7fae0341 100644 --- a/src/libsyntax/ext/deriving/hash.rs +++ b/src/libsyntax/ext/deriving/hash.rs @@ -65,9 +65,19 @@ fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) [ref state_expr] => state_expr, _ => cx.span_bug(trait_span, "incorrect number of arguments in `deriving(Hash)`") }; - let hash_ident = substr.method_ident; + 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(trait_span, strs)) + }; let call_hash = |&: span, thing_expr| { - let expr = cx.expr_method_call(span, thing_expr, hash_ident, vec!(state_expr.clone())); + let ref_thing = cx.expr_addr_of(span, thing_expr); + let expr = cx.expr_call(span, hash_path.clone(), vec!(ref_thing, state_expr.clone())); cx.stmt_expr(expr) }; let mut stmts = Vec::new(); diff --git a/src/test/compile-fail/issue-21160.rs b/src/test/compile-fail/issue-21160.rs new file mode 100644 index 00000000000..30ed4f43940 --- /dev/null +++ b/src/test/compile-fail/issue-21160.rs @@ -0,0 +1,21 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +struct Bar; + +impl Bar { + fn hash(&self, _: T) {} +} + +#[derive(Hash)] +//~^ error: the trait `core::hash::Hash<__S>` is not implemented for the type `Bar` +struct Foo(Bar); + +fn main() {} From 86948adfdedb35051e55f41e865ee0ead6f53471 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 14 Jan 2015 19:21:14 -0500 Subject: [PATCH 2/3] fix unused import error --- src/librustc/middle/region.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs index 5d33a7efd3b..8dcbc74f0eb 100644 --- a/src/librustc/middle/region.rs +++ b/src/librustc/middle/region.rs @@ -22,6 +22,8 @@ use util::nodemap::{FnvHashMap, FnvHashSet, NodeMap}; use util::common::can_reach; use std::cell::RefCell; +// NOTE(stage0) remove import after a snapshot +#[cfg(stage0)] use std::hash::{Hash}; use syntax::codemap::Span; use syntax::{ast, visit}; From 28b0d4029e3ae65505b19bf74379a8516b0e1fc9 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 14 Jan 2015 20:03:17 -0500 Subject: [PATCH 3/3] use better span --- src/libsyntax/ext/deriving/hash.rs | 22 +++++++++++----------- src/test/compile-fail/issue-21160.rs | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libsyntax/ext/deriving/hash.rs b/src/libsyntax/ext/deriving/hash.rs index 98b7fae0341..889a212a287 100644 --- a/src/libsyntax/ext/deriving/hash.rs +++ b/src/libsyntax/ext/deriving/hash.rs @@ -65,19 +65,19 @@ fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) [ref state_expr] => state_expr, _ => cx.span_bug(trait_span, "incorrect number of arguments in `deriving(Hash)`") }; - 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(trait_span, strs)) - }; let call_hash = |&: span, thing_expr| { + 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)) + }; let ref_thing = cx.expr_addr_of(span, thing_expr); - let expr = cx.expr_call(span, hash_path.clone(), vec!(ref_thing, state_expr.clone())); + let expr = cx.expr_call(span, hash_path, vec!(ref_thing, state_expr.clone())); cx.stmt_expr(expr) }; let mut stmts = Vec::new(); diff --git a/src/test/compile-fail/issue-21160.rs b/src/test/compile-fail/issue-21160.rs index 30ed4f43940..0ee38166935 100644 --- a/src/test/compile-fail/issue-21160.rs +++ b/src/test/compile-fail/issue-21160.rs @@ -15,7 +15,7 @@ impl Bar { } #[derive(Hash)] -//~^ error: the trait `core::hash::Hash<__S>` is not implemented for the type `Bar` struct Foo(Bar); +//~^ error: the trait `core::hash::Hash<__S>` is not implemented for the type `Bar` fn main() {}