Skip to content

Commit d8a34e7

Browse files
committed
Convert delegate to use an object type and remove FIXME from closed issue
1 parent 96dfed2 commit d8a34e7

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/librustc/middle/expr_use_visitor.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ pub trait Delegate {
104104
// supplies types from the tree. After type checking is complete, you
105105
// can just use the tcx as the typer.
106106

107-
pub struct ExprUseVisitor<'d,'t,D,TYPER> {
107+
pub struct ExprUseVisitor<'d,'t,TYPER> {
108108
typer: &'t TYPER,
109109
mc: mc::MemCategorizationContext<'t,TYPER>,
110-
delegate: &'d mut D,
110+
delegate: &'d mut Delegate,
111111
}
112112

113113
// If the TYPER results in an error, it's because the type check
@@ -126,10 +126,10 @@ macro_rules! ignore_err(
126126
)
127127
)
128128

129-
impl<'d,'t,D:Delegate,TYPER:mc::Typer> ExprUseVisitor<'d,'t,D,TYPER> {
130-
pub fn new(delegate: &'d mut D,
129+
impl<'d,'t,TYPER:mc::Typer> ExprUseVisitor<'d,'t,TYPER> {
130+
pub fn new(delegate: &'d mut Delegate,
131131
typer: &'t TYPER)
132-
-> ExprUseVisitor<'d,'t,D,TYPER> {
132+
-> ExprUseVisitor<'d,'t,TYPER> {
133133
ExprUseVisitor { typer: typer,
134134
mc: mc::MemCategorizationContext::new(typer),
135135
delegate: delegate }
@@ -370,13 +370,10 @@ impl<'d,'t,D:Delegate,TYPER:mc::Typer> ExprUseVisitor<'d,'t,D,TYPER> {
370370
}
371371

372372
ast::ExprAssignOp(_, lhs, rhs) => {
373-
// FIXME(#4712) --- Overloaded operators?
374-
//
375-
// if !self.walk_overloaded_operator(expr, [lhs, rhs])
376-
// {
373+
// This will have to change if/when we support
374+
// overloaded operators for `+=` and so forth.
377375
self.mutate_expr(expr, lhs, WriteAndRead);
378376
self.consume_expr(rhs);
379-
// }
380377
}
381378

382379
ast::ExprRepeat(base, count) => {

0 commit comments

Comments
 (0)