diff options
| author | Luqman Aden <laden@csclub.uwaterloo.ca> | 2014-06-12 18:58:37 -0400 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-13 13:53:35 -0700 |
| commit | 8c4a10a159a021a586a8a35552cbbe4f60e644a2 (patch) | |
| tree | 228ab3c4cc8a00706aef3a6eb04ee6433c0863f0 | |
| parent | d884cc83b0e44c27d5d01e97a0b0f85582f5d435 (diff) | |
| download | rust-8c4a10a159a021a586a8a35552cbbe4f60e644a2.tar.gz rust-8c4a10a159a021a586a8a35552cbbe4f60e644a2.zip | |
librustc: Take in account mutability when casting array to raw ptr.
| -rw-r--r-- | src/librustc/middle/typeck/check/mod.rs | 6 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-14845.rs | 24 |
2 files changed, 27 insertions, 3 deletions
diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index 544990d19a5..b9933fed296 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -3099,9 +3099,9 @@ fn check_expr_with_unifier(fcx: &FnCtxt, /* this cast is only allowed from &[T] to *T or &T to *T. */ match (&ty::get(te).sty, &ty::get(t_1).sty) { - (&ty::ty_rptr(_, mt1), &ty::ty_ptr(mt2)) - if types_compatible(fcx, e.span, - mt1.ty, mt2.ty) => { + (&ty::ty_rptr(_, ty::mt { ty: mt1, mutbl: ast::MutImmutable }), + &ty::ty_ptr(ty::mt { ty: mt2, mutbl: ast::MutImmutable })) + if types_compatible(fcx, e.span, mt1, mt2) => { /* this case is allowed */ } _ => { diff --git a/src/test/compile-fail/issue-14845.rs b/src/test/compile-fail/issue-14845.rs new file mode 100644 index 00000000000..d87eab7b6de --- /dev/null +++ b/src/test/compile-fail/issue-14845.rs @@ -0,0 +1,24 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + + +struct X { + a: [u8, ..1] +} + +fn main() { + let x = X { a: [0] }; + let _f = &x.a as *mut u8; + //~^ ERROR mismatched types: expected `*mut u8` but found `&[u8, .. 1]` + + let local = [0u8]; + let _v = &local as *mut u8; + //~^ ERROR mismatched types: expected `*mut u8` but found `&[u8, .. 1]` +} |
