forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#41937 - nikomatsakis:issue-41936-variance-c…
…oerce-unsized-cycle, r=eddyb use equality in the coerce-unsized check This seems both to be a safe, conservative choice, and it sidesteps the cycle in rust-lang#41849. Note that, before I converted variance into proper queries, we were using a hybrid of subtyping and equality, due to the presence of a flag that forced invariance if variance had not yet been computed. (Also, Coerce Unsized is unstable.) Fixes rust-lang#41936. r? @eddyb
- Loading branch information
Showing
2 changed files
with
87 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
// Copyright 2016 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. | ||
|
||
// Regression test for #41936. The coerce-unsized trait check in | ||
// coherence was using subtyping, which triggered variance | ||
// computation, which failed because it required type info for fields | ||
// that had not (yet) been computed. | ||
|
||
#![feature(unsize)] | ||
#![feature(coerce_unsized)] | ||
|
||
use std::{marker,ops}; | ||
|
||
// Change the array to a non-array, and error disappears | ||
// Adding a new field to the end keeps the error | ||
struct LogDataBuf([u8;8]); | ||
|
||
struct Aref<T: ?Sized> | ||
{ | ||
// Inner structure triggers the error, removing the inner removes the message. | ||
ptr: Box<ArefInner<T>>, | ||
} | ||
impl<T: ?Sized + marker::Unsize<U>, U: ?Sized> ops::CoerceUnsized<Aref<U>> for Aref<T> {} | ||
|
||
struct ArefInner<T: ?Sized> | ||
{ | ||
// Even with this field commented out, the error is raised. | ||
data: T, | ||
} | ||
|
||
fn main(){} |