diff options
| author | bors <bors@rust-lang.org> | 2014-01-31 22:21:38 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-31 22:21:38 -0800 |
| commit | 5c5d995126ac3e9b4629a55fce941c558d5bb0cb (patch) | |
| tree | 454a14962add2bfc63aa8c0beff080daf313a15e /src/libsyntax/ext | |
| parent | cc6afe1ec0d3e5e9da4c0f7d0443991afe74dfaf (diff) | |
| parent | a67a3b7749c9a0544b2fe69338c17c6314be935d (diff) | |
auto merge of #11965 : alexcrichton/rust/issue-7385, r=alexcrichton
I've verified that it works on osx x86_64 Closes #7385 Rolled up PRs: Closes #11898 Closes #11934 Closes #11942 Closes #11952 Closes #11960 Closes #11966 Closes #11953 Closed issues: Closes #4063 Closes #7911
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/deriving/generic.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs index 9ebb771f5da..6449d0aab5e 100644 --- a/src/libsyntax/ext/deriving/generic.rs +++ b/src/libsyntax/ext/deriving/generic.rs @@ -1,4 +1,4 @@ -// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -42,7 +42,7 @@ arguments: the same variant (e.g. `None`, `Some(1)` and `None`). If `const_nonmatching` is true, this will contain an empty list. - `StaticEnum` and `StaticStruct` for static methods, where the type - being derived upon is either a enum or struct respectively. (Any + being derived upon is either an enum or struct respectively. (Any argument with type Self is just grouped among the non-self arguments.) |