Removed @self and @Trait.
auto merge of #12030 : eddyb/rust/kill-at-self-and-trait, r=pcwalton