Auto merge of #28381 - ebfull:aint-fraid-a-no-ghosts-redux, r=me
#27483 redux at Gankro's request. Fixes #26905, Closes #28239 r? @nrc
This commit is contained in:
commit
89faafcd67
5 changed files with 82 additions and 2 deletions
34
src/test/compile-fail/issue-26905.rs
Normal file
34
src/test/compile-fail/issue-26905.rs
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
// Copyright 2015 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(unsize, coerce_unsized)]
|
||||
|
||||
// Verfies that non-PhantomData ZSTs still cause coercions to fail.
|
||||
// They might have additional semantics that we don't want to bulldoze.
|
||||
|
||||
use std::marker::{Unsize, PhantomData};
|
||||
use std::ops::CoerceUnsized;
|
||||
|
||||
struct NotPhantomData<T: ?Sized>(PhantomData<T>);
|
||||
|
||||
struct MyRc<T: ?Sized> {
|
||||
_ptr: *const T,
|
||||
_boo: NotPhantomData<T>,
|
||||
}
|
||||
|
||||
impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<MyRc<U>> for MyRc<T>{ } //~ERROR
|
||||
|
||||
fn main() {
|
||||
let data = [1, 2, 3];
|
||||
let iter = data.iter();
|
||||
let x = MyRc { _ptr: &iter, _boo: NotPhantomData(PhantomData) };
|
||||
let _y: MyRc<Iterator<Item=&u32>> = x;
|
||||
}
|
||||
|
||||
31
src/test/run-pass/issue-26905.rs
Normal file
31
src/test/run-pass/issue-26905.rs
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
// Copyright 2015 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(unsize, coerce_unsized)]
|
||||
|
||||
// Verfies that PhantomData is ignored for DST coercions
|
||||
|
||||
use std::marker::{Unsize, PhantomData};
|
||||
use std::ops::CoerceUnsized;
|
||||
|
||||
struct MyRc<T: ?Sized> {
|
||||
_ptr: *const T,
|
||||
_boo: PhantomData<T>,
|
||||
}
|
||||
|
||||
impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<MyRc<U>> for MyRc<T>{ }
|
||||
|
||||
fn main() {
|
||||
let data = [1, 2, 3];
|
||||
let iter = data.iter();
|
||||
let x = MyRc { _ptr: &iter, _boo: PhantomData };
|
||||
let _y: MyRc<Iterator<Item=&u32>> = x;
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue