]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12066 : huonw/rust/show2, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 8 Feb 2014 04:46:30 +0000 (20:46 -0800)
committerbors <bors@rust-lang.org>
Sat, 8 Feb 2014 04:46:30 +0000 (20:46 -0800)
- Convert the formatting traits to `&self` rather than `_: &Self`
- Rejig `syntax::ext::{format,deriving}` a little in preparation
- Implement `#[deriving(Show)]`


Trivial merge