Skip to content

Commit 630ae21

Browse files
committed
---
yaml --- r: 10677 b: refs/heads/snap-stage3 c: 46809f7 h: refs/heads/master i: 10675: ddd50ed v: v3
1 parent 6bcc278 commit 630ae21

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 47b1b7a207c6fa1c0af0dfc789c253f6c40bbf7f
4+
refs/heads/snap-stage3: 46809f7ab7e2276d004da3476074a0489de996f8
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rustc/middle/typeck/check.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,8 +1551,9 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
15511551
}
15521552
none {
15531553
let t_err = fcx.infcx.resolve_type_vars_if_possible(expr_t);
1554-
let msg = #fmt["attempted access of field %s on type %s, but \
1555-
no public field or method with that name was found",
1554+
let msg = #fmt["attempted access of field `%s` on type `%s`, \
1555+
but no public field or method with that name \
1556+
was found",
15561557
*field, fcx.infcx.ty_to_str(t_err)];
15571558
tcx.sess.span_err(expr.span, msg);
15581559
// NB: Adding a bogus type to allow typechecking to continue

branches/snap-stage3/src/test/compile-fail/class-cast-to-iface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern: attempted access of field eat on type noisy
1+
// error-pattern: attempted access of field `eat` on type `noisy`
22
iface noisy {
33
fn speak();
44
}

branches/snap-stage3/src/test/compile-fail/private-method-cross-crate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern:attempted access of field nap on type
1+
// error-pattern:attempted access of field `nap` on type
22
// xfail-fast
33
// aux-build:cci_class_5.rs
44
use cci_class_5;

branches/snap-stage3/src/test/compile-fail/unsafe-fn-autoderef.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn f(p: *rec) -> int {
1515
// are prohibited by various checks, such as that the enum is
1616
// instantiable and so forth).
1717

18-
ret p.f; //! ERROR attempted access of field f on type *rec
18+
ret p.f; //! ERROR attempted access of field `f` on type `*rec`
1919
}
2020

2121
fn main() {

branches/snap-stage3/src/test/compile-fail/vec-field.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern:attempted access of field some_field_name on type [int]
1+
// error-pattern:attempted access of field `some_field_name` on type `[int]`
22
// issue #367
33

44
fn f() {

0 commit comments

Comments
 (0)