---

yaml
---
r: 112883
b: refs/heads/auto
c: d8a34e7
h: refs/heads/master
i:
  112881: 8498626
  112879: ab28b9c
v: v3

Author: nikomatsakis

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 96dfed2b62c6e84a542f9a170133ec528e2191c2
+refs/heads/auto: d8a34e7d3f3f447ccff0b72fd5fb18a7c78d0cc5
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/expr_use_visitor.rs

@@ -104,10 +104,10 @@ pub trait Delegate {
 // supplies types from the tree. After type checking is complete, you
 // can just use the tcx as the typer.
 
-pub struct ExprUseVisitor<'d,'t,D,TYPER> {
+pub struct ExprUseVisitor<'d,'t,TYPER> {
     typer: &'t TYPER,
     mc: mc::MemCategorizationContext<'t,TYPER>,
-    delegate: &'d mut D,
+    delegate: &'d mut Delegate,
 }
 
 // If the TYPER results in an error, it's because the type check
@@ -126,10 +126,10 @@ macro_rules! ignore_err(
     )
 )
 
-impl<'d,'t,D:Delegate,TYPER:mc::Typer> ExprUseVisitor<'d,'t,D,TYPER> {
-    pub fn new(delegate: &'d mut D,
+impl<'d,'t,TYPER:mc::Typer> ExprUseVisitor<'d,'t,TYPER> {
+    pub fn new(delegate: &'d mut Delegate,
                typer: &'t TYPER)
-               -> ExprUseVisitor<'d,'t,D,TYPER> {
+               -> ExprUseVisitor<'d,'t,TYPER> {
         ExprUseVisitor { typer: typer,
                          mc: mc::MemCategorizationContext::new(typer),
                          delegate: delegate }
@@ -370,13 +370,10 @@ impl<'d,'t,D:Delegate,TYPER:mc::Typer> ExprUseVisitor<'d,'t,D,TYPER> {
             }
 
             ast::ExprAssignOp(_, lhs, rhs) => {
-                // FIXME(#4712) --- Overloaded operators?
-                //
-                // if !self.walk_overloaded_operator(expr, [lhs, rhs])
-                // {
+                // This will have to change if/when we support
+                // overloaded operators for `+=` and so forth.
                 self.mutate_expr(expr, lhs, WriteAndRead);
                 self.consume_expr(rhs);
-                // }
             }
 
             ast::ExprRepeat(base, count) => {