Skip to content

Commit 33fe925

Browse files
jroeschJared Roesch
authored andcommitted
---
yaml --- r: 224247 b: refs/heads/beta c: 91de8e6 h: refs/heads/master i: 224245: 7d641b2 224243: 92128e0 224239: f03e761 v: v3
1 parent 8c4974f commit 33fe925

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: bbcb13da88f7a4b25506ec85f2f170e6f78d5a58
26+
refs/heads/beta: 91de8e6c281fafd257e52def26551b2b722aaddb
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/infer/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,9 +1328,10 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
13281328
})
13291329
};
13301330

1331-
self.report_and_explain_type_error(trace, &ty::type_err::terr_ty_param_default_mismatch(ty::expected_found {
1332-
expected: expected,
1333-
found: actual
1331+
self.report_and_explain_type_error(trace,
1332+
&ty::type_err::terr_ty_param_default_mismatch(ty::expected_found {
1333+
expected: expected,
1334+
found: actual
13341335
}));
13351336
}
13361337

0 commit comments

Comments
 (0)