Skip to content

Commit

Permalink
Make irrelevant changes to regions-mock-tcx to convince the pretty pr…
Browse files Browse the repository at this point in the history
…inter to emit the same thing twice in a row
  • Loading branch information
nikomatsakis committed Nov 9, 2013
1 parent a15196c commit f6e8d49
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/test/run-pass/regions-mock-tcx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ enum AstKind<'ast> {
ExprInt,
ExprVar(uint),
ExprLambda(Ast<'ast>),
// ...
}

fn compute_types<'tcx,'ast>(tcx: &mut TypeContext<'tcx,'ast>,
Expand All @@ -104,15 +103,12 @@ fn compute_types<'tcx,'ast>(tcx: &mut TypeContext<'tcx,'ast>,
let ty = tcx.add_type(TypeInt);
tcx.set_type(ast.id, ty)
}

ExprLambda(ast) => {
let arg_ty = tcx.add_type(TypeInt);
let body_ty = compute_types(tcx, ast);
let lambda_ty = tcx.add_type(TypeFunction(arg_ty, body_ty));
tcx.set_type(ast.id, lambda_ty)
}

// ...
}
}

Expand Down

5 comments on commit f6e8d49

@bors
Copy link
Contributor

@bors bors commented on f6e8d49 Nov 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pnkfelix
at nikomatsakis@f6e8d49

@bors
Copy link
Contributor

@bors bors commented on f6e8d49 Nov 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging nikomatsakis/rust/issue-4846-multiple-lifetime-parameters-7 = f6e8d49 into auto

@bors
Copy link
Contributor

@bors bors commented on f6e8d49 Nov 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nikomatsakis/rust/issue-4846-multiple-lifetime-parameters-7 = f6e8d49 merged ok, testing candidate = 8379890

@bors
Copy link
Contributor

@bors bors commented on f6e8d49 Nov 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on f6e8d49 Nov 9, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 8379890

Please sign in to comment.