auto merge of #10750 : Blei/rust/no-at-struct-field, r=alexcrichton

diff --cc src/librustc/metadata/encoder.rs
Simple merge

diff --cc src/librustc/middle/lint.rs
Simple merge

diff --cc src/librustc/middle/resolve.rs
Simple merge

diff --cc src/librustc/middle/trans/base.rs
index 1dba8169da831a72897f2398541347451b13edae,09e1f9b497b116cc59641e0d9d225e23539bb646..f992411a548509f1194333d2a2f61d708735148a
--- 1/src/librustc/middle/trans/base.rs
--- 2/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@@@ -2059,12 -2059,12 +2059,12 @@@ trait IdAndTy 
  
  impl IdAndTy for ast::variant_arg {
      fn id(&self) -> ast::NodeId { self.id }
 -    fn ty<'a>(&'a self) -> &'a ast::Ty { &self.ty }
 +    fn ty(&self) -> ast::P<ast::Ty> { self.ty }
  }
  
- impl IdAndTy for @ast::struct_field {
+ impl IdAndTy for ast::struct_field {
      fn id(&self) -> ast::NodeId { self.node.id }
 -    fn ty<'a>(&'a self) -> &'a ast::Ty { &self.node.ty }
 +    fn ty(&self) -> ast::P<ast::Ty> { self.node.ty }
  }
  
  pub fn trans_enum_variant_or_tuple_like_struct<A:IdAndTy>(

diff --cc src/librustc/middle/ty.rs
Simple merge

diff --cc src/librustc/middle/typeck/collect.rs
Simple merge

diff --cc src/librustdoc/doctree.rs
Simple merge

diff --cc src/librustdoc/visit_ast.rs
Simple merge

diff --cc src/libsyntax/ast.rs
Simple merge

diff --cc src/libsyntax/ast_util.rs
Simple merge

diff --cc src/libsyntax/fold.rs
Simple merge

diff --cc src/libsyntax/parse/parser.rs
Simple merge

diff --cc src/libsyntax/visit.rs
Simple merge