Skip to content

Commit 3bee68e

Browse files
jroeschJared Roesch
authored andcommitted
---
yaml --- r: 235830 b: refs/heads/stable c: 91de8e6 h: refs/heads/master v: v3
1 parent 8681bc6 commit 3bee68e

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
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: bbcb13da88f7a4b25506ec85f2f170e6f78d5a58
32+
refs/heads/stable: 91de8e6c281fafd257e52def26551b2b722aaddb
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/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)