Skip to content

Commit

Permalink
syntax: change the #[deriving(Hash)] typaram variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
erickt committed Mar 13, 2014
1 parent d2cfd54 commit 62026fd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/libsyntax/ext/deriving/hash.rs
Expand Up @@ -24,12 +24,12 @@ pub fn expand_deriving_hash(cx: &mut ExtCtxt,

let (path, generics, args) = if cx.ecfg.deriving_hash_type_parameter {
(Path::new_(vec!("std", "hash", "Hash"), None,
vec!(~Literal(Path::new_local("__H"))), true),
vec!(~Literal(Path::new_local("__S"))), true),
LifetimeBounds {
lifetimes: Vec::new(),
bounds: vec!(("__H", vec!(Path::new(vec!("std", "io", "Writer"))))),
bounds: vec!(("__S", vec!(Path::new(vec!("std", "io", "Writer"))))),
},
Path::new_local("__H"))
Path::new_local("__S"))
} else {
(Path::new(vec!("std", "hash", "Hash")),
LifetimeBounds::empty(),
Expand Down

5 comments on commit 62026fd

@bors
Copy link
Contributor

@bors bors commented on 62026fd Mar 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from acrichto
at erickt@62026fd

@bors
Copy link
Contributor

@bors bors commented on 62026fd Mar 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging erickt/rust/cleanup = 62026fd into auto

@bors
Copy link
Contributor

@bors bors commented on 62026fd Mar 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

erickt/rust/cleanup = 62026fd merged ok, testing candidate = e86e1d8

@bors
Copy link
Contributor

@bors bors commented on 62026fd Mar 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = e86e1d8

Please sign in to comment.