Merge branch 'incoming' of github.com:mozilla/rust

3 files changed, 2 insertions, 4 deletions

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index fb27724e369..4988adf9373 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -87,7 +87,7 @@ enum def {
     def_upvar(node_id /* local id of closed over var */,
               @def    /* closed over def */,
               node_id /* expr node that creates the closure */),
-    def_class(def_id),
+    def_class(def_id, bool /* has constructor */),
     def_region(node_id)
 }
 
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index 37e8671facd..0cf593efdc3 100644
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -53,7 +53,7 @@ pure fn def_id_of_def(d: def) -> def_id {
       def_fn(id, _) | def_mod(id) |
       def_foreign_mod(id) | def_const(id) |
       def_variant(_, id) | def_ty(id) | def_ty_param(id, _) |
-      def_use(id) | def_class(id) { id }
+      def_use(id) | def_class(id, _) { id }
       def_arg(id, _) | def_local(id, _) | def_self(id) |
       def_upvar(id, _, _) | def_binding(id) | def_region(id) {
         local_def(id)
diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs
index c9b35e561bb..f367fb63985 100644
--- a/src/libsyntax/ext/pipes/ast_builder.rs
+++ b/src/libsyntax/ext/pipes/ast_builder.rs
@@ -183,7 +183,6 @@ impl ast_builder of ext_ctxt_ast_builder for ext_ctxt {
         {mode: ast::infer(self.next_id()),
          ty: ty,
          ident: name,
-         // FIXME #2886: should this be the same as the infer id?
          id: self.next_id()}
     }
 
@@ -280,7 +279,6 @@ impl ast_builder of ext_ctxt_ast_builder for ext_ctxt {
     }
 
     fn ty_path_ast_builder(path: @ast::path) -> @ast::ty {
-        // FIXME #2886: make sure the node ids are legal.
         @{id: self.next_id(),
           node: ast::ty_path(path, self.next_id()),
           span: self.empty_span()}