Skip to content

Commit e1e60fc

Browse files
committed
---
yaml --- r: 223902 b: refs/heads/beta c: 69e6dc0 h: refs/heads/master v: v3
1 parent fb67bf2 commit e1e60fc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
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: 7c202a39c156d9a51c3dd1ebe34ecaaea188a175
26+
refs/heads/beta: 69e6dc0444bb62a474c8c5f7490c660f9d88c172
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_typeck/check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3427,7 +3427,7 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
34273427
let struct_id = match def {
34283428
def::DefVariant(enum_id, variant_id, true) => {
34293429
if let &Some(ref base_expr) = base_expr {
3430-
span_err!(tcx.sess, base_expr.span, E0401,
3430+
span_err!(tcx.sess, base_expr.span, E0436,
34313431
"functional record update syntax requires a struct");
34323432
fcx.write_error(base_expr.id);
34333433
}

branches/beta/src/librustc_typeck/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2211,5 +2211,5 @@ register_diagnostics! {
22112211
// type because its default value `{}` references the type `Self`"
22122212
E0399, // trait items need to be implemented because the associated
22132213
// type `{}` was overridden
2214-
E0401 // functional record update requires a struct
2214+
E0436 // functional record update requires a struct
22152215
}

0 commit comments

Comments
 (0)