rollup merge of #19090: kmcallister/deriving-non-type

Besides being more helpful, this gives us the flexibility to later define a meaning for something like

```rust
#[deriving(...)]
mod bar { ... }
```

diff --cc src/libsyntax/ext/deriving/generic/mod.rs
Simple merge