Skip to content

Commit b98d4f2

Browse files
luqmanaalexcrichton
authored andcommitted
---
yaml --- r: 152501 b: refs/heads/try2 c: 8c4a10a h: refs/heads/master i: 152499: 74ece79 v: v3
1 parent b1a0344 commit b98d4f2

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: d884cc83b0e44c27d5d01e97a0b0f85582f5d435
8+
refs/heads/try2: 8c4a10a159a021a586a8a35552cbbe4f60e644a2
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3099,9 +3099,9 @@ fn check_expr_with_unifier(fcx: &FnCtxt,
30993099
/* this cast is only allowed from &[T] to *T or
31003100
&T to *T. */
31013101
match (&ty::get(te).sty, &ty::get(t_1).sty) {
3102-
(&ty::ty_rptr(_, mt1), &ty::ty_ptr(mt2))
3103-
if types_compatible(fcx, e.span,
3104-
mt1.ty, mt2.ty) => {
3102+
(&ty::ty_rptr(_, ty::mt { ty: mt1, mutbl: ast::MutImmutable }),
3103+
&ty::ty_ptr(ty::mt { ty: mt2, mutbl: ast::MutImmutable }))
3104+
if types_compatible(fcx, e.span, mt1, mt2) => {
31053105
/* this case is allowed */
31063106
}
31073107
_ => {
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
12+
struct X {
13+
a: [u8, ..1]
14+
}
15+
16+
fn main() {
17+
let x = X { a: [0] };
18+
let _f = &x.a as *mut u8;
19+
//~^ ERROR mismatched types: expected `*mut u8` but found `&[u8, .. 1]`
20+
21+
let local = [0u8];
22+
let _v = &local as *mut u8;
23+
//~^ ERROR mismatched types: expected `*mut u8` but found `&[u8, .. 1]`
24+
}

0 commit comments

Comments
 (0)