---

yaml
---
r: 167394
b: refs/heads/snap-stage3
c: adca15a
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 023dfb0c898d851dee6ace2f8339b73b5287136b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7836c72ebae3124443fd4009b65eb2cc4cc6cf38
+refs/heads/snap-stage3: adca15a151422a72d69c39ade946f36a2ff072a6
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc/middle/def.rs

@@ -36,6 +36,7 @@ pub enum Def {
     // A partially resolved path to an associated type `T::U` where `T` is a concrete
     // type (indicated by the DefId) which implements a trait which has an associated
     // type `U` (indicated by the Ident).
+    // FIXME(#20301) -- should use Name
     DefAssociatedPath(TyParamProvenance, ast::Ident),
     DefTrait(ast::DefId),
     DefPrimTy(ast::PrimTy),

branches/snap-stage3/src/librustc_typeck/astconv.rs

@@ -992,7 +992,7 @@ fn qpath_to_ty<'tcx,AC,RS>(this: &AC,
 
     return this.projected_ty(ast_ty.span,
                              trait_ref,
-                             qpath.item_name.name); // TODO change qpath to use name
+                             qpath.item_name.name);
 }
 
 // Parses the programmer's textual representation of a type into our
@@ -1155,7 +1155,6 @@ pub fn ast_ty_to_ty<'tcx, AC: AstConv<'tcx>, RS: RegionScope>(
                         this.tcx().types.err
                     }
                     def::DefAssociatedPath(provenance, assoc_ident) => {
-                        // TODO update DefAssociatedPath to use name
                         associated_path_def_to_ty(this, ast_ty, provenance, assoc_ident.name)
                     }
                     _ => {

branches/snap-stage3/src/libsyntax/ast.rs

@@ -764,7 +764,7 @@ pub enum Expr_ {
 pub struct QPath {
     pub self_type: P<Ty>,
     pub trait_ref: P<TraitRef>,
-    pub item_name: Ident,
+    pub item_name: Ident, // FIXME(#20301) -- should use Name
 }
 
 #[deriving(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Show, Copy)]