mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #15071 : tomjakubowski/rust/fix-15052, r=alexcrichton

Browse Source 
Fix #15052
This commit is contained in:
bors 2014-06-24 15:32:29 +00:00
commit c38125987f
3 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc/middle/mem_categorization.rs
View File

@ -1121,7 +1121,10 @@ pub fn cmt_to_str(&self, cmt: &cmt_) -> String {
"captured outer variable".to_string()
}
_ => {
format!("dereference of `{}`-pointer", ptr_sigil(pk))
match pk {
OwnedPtr | GcPtr => format!("dereference of `{}`", ptr_sigil(pk)),
_ => format!("dereference of `{}`-pointer", ptr_sigil(pk))
}
}
}
}
@ -1291,8 +1294,8 @@ fn repr(&self, tcx: &ty::ctxt) -> String {
pub fn ptr_sigil(ptr: PointerKind) -> &'static str {
match ptr {
OwnedPtr => "~",
GcPtr => "@",
OwnedPtr => "Box",
GcPtr => "Gc",
BorrowedPtr(ty::ImmBorrow, _) => "&",
BorrowedPtr(ty::MutBorrow, _) => "&mut",
BorrowedPtr(ty::UniqueImmBorrow, _) => "&unique",

22
src/test/compile-fail/borrowck-borrow-immut-deref-of-box-as-mut.rs Normal file
View File

@ -0,0 +1,22 @@
// 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 A;
impl A {
fn foo(&mut self) {
}
}
pub fn main() {
let a = box A;
a.foo();
//~^ ERROR cannot borrow immutable dereference of `Box` `*a` as mutable
}

26
src/test/compile-fail/borrowck-borrow-immut-deref-of-gc-as-mut.rs Normal file
View File

@ -0,0 +1,26 @@
// 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.
#![feature(managed_boxes)]
use std::gc::GC;
struct A;
impl A {
fn foo(&mut self) {
}
}
pub fn main() {
let a = box(GC) A;
a.foo();
//~^ ERROR cannot borrow immutable dereference of `Gc` `*a` as mutable
}