auto merge of #13704 : edwardw/rust/doc-hidden, r=alexcrichton

Closes #13698

diff --cc src/libsyntax/ext/deriving/clone.rs
index e0b493cd8d9c0d4371e84dd50cca9223dfcb8258,6db9954820678d942475097346953f3eb0ce40d4..510241588228ce105ba5e86abda2d487220db2ce
--- 1/src/libsyntax/ext/deriving/clone.rs
--- 2/src/libsyntax/ext/deriving/clone.rs
+++ b/src/libsyntax/ext/deriving/clone.rs
@@@ -32,11 -35,9 +35,11 @@@ pub fn expand_deriving_clone(cx: &mut E
                  explicit_self: borrowed_explicit_self(),
                  args: Vec::new(),
                  ret_ty: Self,
-                 inline: true,
+                 attributes: attrs,
                  const_nonmatching: false,
 -                combine_substructure: |c, s, sub| cs_clone("Clone", c, s, sub)
 +                combine_substructure: combine_substructure(|c, s, sub| {
 +                    cs_clone("Clone", c, s, sub)
 +                }),
              }
          )
      };

diff --cc src/libsyntax/ext/deriving/cmp/eq.rs
index 35b7e7c1a666e772cb9f249b107579a8911eabca,8a877a2a7a4a35b081836018e5aace6baa9867cb..92b3788c247443c53791a8eecbb6e8480ac52d09
--- 1/src/libsyntax/ext/deriving/cmp/eq.rs
--- 2/src/libsyntax/ext/deriving/cmp/eq.rs
+++ b/src/libsyntax/ext/deriving/cmp/eq.rs
@@@ -38,13 -41,11 +41,13 @@@ pub fn expand_deriving_eq(cx: &mut ExtC
                  explicit_self: borrowed_explicit_self(),
                  args: vec!(borrowed_self()),
                  ret_ty: Literal(Path::new(vec!("bool"))),
-                 inline: true,
+                 attributes: attrs,
                  const_nonmatching: true,
 -                combine_substructure: $f
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    $f(a, b, c)
 +                })
              }
-         }
+         } }
      );
  
      let trait_def = TraitDef {

diff --cc src/libsyntax/ext/deriving/cmp/ord.rs
index afe2d3dae6a71e63a0b4c3cee718e2bec920dea9,2b2a490e5a403932f493f1ec4049cb94c20276e6..dd2f90cfa5fae9ac21880ad8a78513c6567d063d
--- 1/src/libsyntax/ext/deriving/cmp/ord.rs
--- 2/src/libsyntax/ext/deriving/cmp/ord.rs
+++ b/src/libsyntax/ext/deriving/cmp/ord.rs
@@@ -28,13 -31,11 +31,13 @@@ pub fn expand_deriving_ord(cx: &mut Ext
                  explicit_self: borrowed_explicit_self(),
                  args: vec!(borrowed_self()),
                  ret_ty: Literal(Path::new(vec!("bool"))),
-                 inline: true,
+                 attributes: attrs,
                  const_nonmatching: false,
 -                combine_substructure: |cx, span, substr| cs_op($op, $equal, cx, span, substr)
 +                combine_substructure: combine_substructure(|cx, span, substr| {
 +                    cs_op($op, $equal, cx, span, substr)
 +                })
              }
-         }
+         } }
      );
  
      let trait_def = TraitDef {

diff --cc src/libsyntax/ext/deriving/cmp/totaleq.rs
index d161f9668505fcccd0d0df6563d91492f06492fa,24e0fc73f2a3d1234e322a2c116013725d9ab1a1..b76caccffecc6095b168fcd4474987124f94bc51
--- 1/src/libsyntax/ext/deriving/cmp/totaleq.rs
--- 2/src/libsyntax/ext/deriving/cmp/totaleq.rs
+++ b/src/libsyntax/ext/deriving/cmp/totaleq.rs
@@@ -46,11 -52,9 +52,11 @@@ pub fn expand_deriving_totaleq(cx: &mu
                  explicit_self: borrowed_explicit_self(),
                  args: vec!(),
                  ret_ty: nil_ty(),
-                 inline: true,
+                 attributes: attrs,
                  const_nonmatching: true,
 -                combine_substructure: cs_total_eq_assert
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    cs_total_eq_assert(a, b, c)
 +                })
              }
          )
      };

diff --cc src/libsyntax/ext/deriving/cmp/totalord.rs
index 69c413890e902fa3cf449ab3132d7d6d024fffeb,c2e52f7ef7701a8a054112aab68e2c51448b2718..3ca4f9e28626380da776cee61b04e8c3a0d70cf3
--- 1/src/libsyntax/ext/deriving/cmp/totalord.rs
--- 2/src/libsyntax/ext/deriving/cmp/totalord.rs
+++ b/src/libsyntax/ext/deriving/cmp/totalord.rs
@@@ -35,11 -38,9 +38,11 @@@ pub fn expand_deriving_totalord(cx: &mu
                  explicit_self: borrowed_explicit_self(),
                  args: vec!(borrowed_self()),
                  ret_ty: Literal(Path::new(vec!("std", "cmp", "Ordering"))),
-                 inline: true,
+                 attributes: attrs,
                  const_nonmatching: false,
 -                combine_substructure: cs_cmp
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    cs_cmp(a, b, c)
 +                }),
              }
          )
      };

diff --cc src/libsyntax/ext/deriving/decodable.rs
index 6d6cdc55d4028825eeff1d001cacb9fb65290576,56fde41635f18befd0c29587f03121448900dd5d..062f198425b28d0ab7289608e18c26c5063e13ef
--- 1/src/libsyntax/ext/deriving/decodable.rs
--- 2/src/libsyntax/ext/deriving/decodable.rs
+++ b/src/libsyntax/ext/deriving/decodable.rs
@@@ -50,11 -50,9 +50,11 @@@ pub fn expand_deriving_decodable(cx: &m
                              Borrowed(None, MutMutable))),
                  ret_ty: Literal(Path::new_(vec!("std", "result", "Result"), None,
                                            vec!(~Self, ~Literal(Path::new_local("__E"))), true)),
-                 inline: false,
+                 attributes: Vec::new(),
                  const_nonmatching: true,
 -                combine_substructure: decodable_substructure,
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    decodable_substructure(a, b, c)
 +                }),
              })
      };
  

diff --cc src/libsyntax/ext/deriving/default.rs
index 633674eff5c18438e010c723dca5d10803a1c83a,e89e25dd26c8337eeb0d7b62688bcd0c9d34b60b..c225906ed2babafcf00398b5b991b8423cd1fcfc
--- 1/src/libsyntax/ext/deriving/default.rs
--- 2/src/libsyntax/ext/deriving/default.rs
+++ b/src/libsyntax/ext/deriving/default.rs
@@@ -32,11 -35,9 +35,11 @@@ pub fn expand_deriving_default(cx: &mu
                  explicit_self: None,
                  args: Vec::new(),
                  ret_ty: Self,
-                 inline: true,
+                 attributes: attrs,
                  const_nonmatching: false,
 -                combine_substructure: default_substructure
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    default_substructure(a, b, c)
 +                })
              })
      };
      trait_def.expand(cx, mitem, item, push)

diff --cc src/libsyntax/ext/deriving/encodable.rs
index acdef8c864509e47851416f1b5a648fb8703edeb,8fdb994ecdd80ba2142e8cf062abc35395565fe6..ec3d4e0078bc6c5c0037088705bff066048a5c97
--- 1/src/libsyntax/ext/deriving/encodable.rs
--- 2/src/libsyntax/ext/deriving/encodable.rs
+++ b/src/libsyntax/ext/deriving/encodable.rs
@@@ -121,11 -121,9 +121,11 @@@ pub fn expand_deriving_encodable(cx: &m
                                             vec!(~Tuple(Vec::new()),
                                                  ~Literal(Path::new_local("__E"))),
                                             true)),
-                 inline: false,
+                 attributes: Vec::new(),
                  const_nonmatching: true,
 -                combine_substructure: encodable_substructure,
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    encodable_substructure(a, b, c)
 +                }),
              })
      };
  

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

diff --cc src/libsyntax/ext/deriving/hash.rs
index 9e160b0e35dfc8e292558032a8fc8fe436ff9936,c6f0900d27bd73a90d8d6e76fa6f04b9af86e3c0..d367ae61e0b8f3e86d62e417821d0607620110eb
--- 1/src/libsyntax/ext/deriving/hash.rs
--- 2/src/libsyntax/ext/deriving/hash.rs
+++ b/src/libsyntax/ext/deriving/hash.rs
@@@ -47,11 -50,9 +50,11 @@@ pub fn expand_deriving_hash(cx: &mut Ex
                  explicit_self: borrowed_explicit_self(),
                  args: vec!(Ptr(~Literal(args), Borrowed(None, MutMutable))),
                  ret_ty: nil_ty(),
-                 inline: true,
+                 attributes: attrs,
                  const_nonmatching: false,
 -                combine_substructure: hash_substructure
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    hash_substructure(a, b, c)
 +                })
              }
          )
      };

diff --cc src/libsyntax/ext/deriving/primitive.rs
index e42a3c67e34ea7201dd86aa0dd917acf80ab49b1,90b011d24e3eacc3b29528272f7ad8d508203f95..0a7aa591657668441b368b0ee3b0eb1d42462ad3
--- 1/src/libsyntax/ext/deriving/primitive.rs
--- 2/src/libsyntax/ext/deriving/primitive.rs
+++ b/src/libsyntax/ext/deriving/primitive.rs
@@@ -38,12 -40,10 +40,12 @@@ pub fn expand_deriving_from_primitive(c
                                             None,
                                             vec!(~Self),
                                             true)),
-                 // liable to cause code-bloat
-                 inline: true,
+                 // #[inline] liable to cause code-bloat
+                 attributes: attrs.clone(),
                  const_nonmatching: false,
 -                combine_substructure: |c, s, sub| cs_from("i64", c, s, sub),
 +                combine_substructure: combine_substructure(|c, s, sub| {
 +                    cs_from("i64", c, s, sub)
 +                }),
              },
              MethodDef {
                  name: "from_u64",
@@@ -55,12 -55,10 +57,12 @@@
                                             None,
                                             vec!(~Self),
                                             true)),
-                 // liable to cause code-bloat
-                 inline: true,
+                 // #[inline] liable to cause code-bloat
+                 attributes: attrs,
                  const_nonmatching: false,
 -                combine_substructure: |c, s, sub| cs_from("u64", c, s, sub),
 +                combine_substructure: combine_substructure(|c, s, sub| {
 +                    cs_from("u64", c, s, sub)
 +                }),
              })
      };
  

diff --cc src/libsyntax/ext/deriving/rand.rs
index 09c3abf42b8cd9920ff54a96f64a5a94e00dd7ca,597e0959de2df8a4a7ebeeb62580f2c2b7ce6146..23877dd29ea79d6c55e909cb7309e8ea33e2416d
--- 1/src/libsyntax/ext/deriving/rand.rs
--- 2/src/libsyntax/ext/deriving/rand.rs
+++ b/src/libsyntax/ext/deriving/rand.rs
@@@ -41,11 -41,9 +41,11 @@@ pub fn expand_deriving_rand(cx: &mut Ex
                          Borrowed(None, ast::MutMutable))
                  ),
                  ret_ty: Self,
-                 inline: false,
+                 attributes: Vec::new(),
                  const_nonmatching: false,
 -                combine_substructure: rand_substructure
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    rand_substructure(a, b, c)
 +                })
              }
          )
      };

diff --cc src/libsyntax/ext/deriving/show.rs
index 7098d0dd6efea4218051b6f8e678d938288eb3d9,153374fbc1630d60a8547fdf62e0fc2700eb5f51..b9725361538d1fbc9500d63f640b07711ab9cab1
--- 1/src/libsyntax/ext/deriving/show.rs
--- 2/src/libsyntax/ext/deriving/show.rs
+++ b/src/libsyntax/ext/deriving/show.rs
@@@ -42,11 -42,9 +42,11 @@@ pub fn expand_deriving_show(cx: &mut Ex
                  explicit_self: borrowed_explicit_self(),
                  args: vec!(fmtr),
                  ret_ty: Literal(Path::new(vec!("std", "fmt", "Result"))),
-                 inline: false,
+                 attributes: Vec::new(),
                  const_nonmatching: false,
 -                combine_substructure: show_substructure
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    show_substructure(a, b, c)
 +                })
              }
          )
      };

diff --cc src/libsyntax/ext/deriving/zero.rs
index 0aeeabcaeabb0d25a96dd49ecfe2cdd559b0a3b8,cbb113f15f707169479f425690151da9a1296c31..449851dd3ea5913aecc03654a5d5f5f55958c801
--- 1/src/libsyntax/ext/deriving/zero.rs
--- 2/src/libsyntax/ext/deriving/zero.rs
+++ b/src/libsyntax/ext/deriving/zero.rs
@@@ -32,11 -35,9 +35,11 @@@ pub fn expand_deriving_zero(cx: &mut Ex
                  explicit_self: None,
                  args: Vec::new(),
                  ret_ty: Self,
-                 inline: true,
+                 attributes: attrs.clone(),
                  const_nonmatching: false,
 -                combine_substructure: zero_substructure
 +                combine_substructure: combine_substructure(|a, b, c| {
 +                    zero_substructure(a, b, c)
 +                })
              },
              MethodDef {
                  name: "is_zero",
@@@ -44,9 -45,9 +47,9 @@@
                  explicit_self: borrowed_explicit_self(),
                  args: Vec::new(),
                  ret_ty: Literal(Path::new(vec!("bool"))),
-                 inline: true,
+                 attributes: attrs,
                  const_nonmatching: false,
 -                combine_substructure: |cx, span, substr| {
 +                combine_substructure: combine_substructure(|cx, span, substr| {
                      cs_and(|cx, span, _, _| cx.span_bug(span,
                                                          "Non-matching enum \
                                                           variant in \