Skip to content

Commit 98f3eb8

Browse files
committed
---
yaml --- r: 159783 b: refs/heads/try c: f791473 h: refs/heads/master i: 159781: d028479 159779: cd21a6d 159775: 3f2f099 v: v3
1 parent 44b4df1 commit 98f3eb8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: e09d98603e608c9e47d4c89f7b4dca87a4b56da3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 9c96a79a74f10bed18b031ce0ac4126c56d6cfb3
5-
refs/heads/try: 680d579ff0e0c8e65e329d29b867600aa2aec478
5+
refs/heads/try: f7914739379711e9f56fdcfab049b5a9531feb52
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc/middle/typeck/check/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,11 +2147,11 @@ fn try_overloaded_call<'a>(fcx: &FnCtxt,
21472147
_ => {}
21482148
}
21492149

2150-
// Try `FnOnce`, then `FnMut`, then `Fn`.
2150+
// Try the options that are least restrictive on the caller first.
21512151
for &(maybe_function_trait, method_name) in [
2152-
(fcx.tcx().lang_items.fn_once_trait(), token::intern("call_once")),
2152+
(fcx.tcx().lang_items.fn_trait(), token::intern("call")),
21532153
(fcx.tcx().lang_items.fn_mut_trait(), token::intern("call_mut")),
2154-
(fcx.tcx().lang_items.fn_trait(), token::intern("call"))
2154+
(fcx.tcx().lang_items.fn_once_trait(), token::intern("call_once")),
21552155
].iter() {
21562156
let function_trait = match maybe_function_trait {
21572157
None => continue,

0 commit comments

Comments
 (0)