Skip to content

Commit

Permalink
Fix tidy error
Browse files Browse the repository at this point in the history
  • Loading branch information
nikomatsakis committed Nov 7, 2014
1 parent 091dc6e commit cf4e53e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/librustc/middle/typeck/collect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,8 @@ pub fn convert(ccx: &CrateCtxt, it: &ast::Item) {
parent_visibility);

for trait_ref in opt_trait_ref.iter() {
astconv::instantiate_trait_ref(&icx, &ExplicitRscope, trait_ref, Some(selfty), None);
astconv::instantiate_trait_ref(&icx, &ExplicitRscope, trait_ref,
Some(selfty), None);
}
},
ast::ItemTrait(_, _, _, ref trait_methods) => {
Expand Down

5 comments on commit cf4e53e

@bors
Copy link
Contributor

@bors bors commented on cf4e53e Nov 9, 2014

Choose a reason for hiding this comment

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

saw approval from pcwalton
at nikomatsakis@cf4e53e

@bors
Copy link
Contributor

@bors bors commented on cf4e53e Nov 9, 2014

Choose a reason for hiding this comment

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

merging nikomatsakis/rust/hrtb-refactor-2 = cf4e53e into auto

@bors
Copy link
Contributor

@bors bors commented on cf4e53e Nov 9, 2014

Choose a reason for hiding this comment

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

nikomatsakis/rust/hrtb-refactor-2 = cf4e53e merged ok, testing candidate = a2f303a

@bors
Copy link
Contributor

@bors bors commented on cf4e53e Nov 9, 2014

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 cf4e53e Nov 9, 2014

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 = a2f303a

Please sign in to comment.