Skip to content

Commit

Permalink
Rollup merge of #89412 - lqd:zvariant-repro, r=Aaron1011
Browse files Browse the repository at this point in the history
Add regression test for issues #88969 and #89119

This adds a regression test to complete #89125, and thus for issues #88969 and #89119, which needed a test.

Used with multiple crates, [this](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=f665e7e882059157e0f86cfb09c47187) minimized from `zvariant-2.8.0` reproduces the error on `nightly-2021-09-19`.

The test in this PR fails on master if the commit 6dbb9d4 from #89125 is reverted, and passes otherwise since it's now fixed.

r? `@Aaron1011`
  • Loading branch information
Manishearth authored Oct 1, 2021
2 parents e834b9d + bec19a7 commit 4571fea
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 0 deletions.
60 changes: 60 additions & 0 deletions src/test/ui/traits/auxiliary/issue_89119_intercrate_caching.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// This is the auxiliary crate for the regression test for issue #89119, minimized
// from `zvariant-2.8.0`.

use std::convert::TryFrom;
use std::borrow::Cow;

pub struct Str<'a>(Cow<'a, str>);
impl<'a> Str<'a> {
pub fn to_owned(&self) -> Str<'static> {
todo!()
}
}

pub enum Value<'a> {
Str(Str<'a>),
Value(Box<Value<'a>>),
}
impl<'a> Value<'a> {
pub fn to_owned(&self) -> Value<'static> {
match self {
Value::Str(v) => Value::Str(v.to_owned()),
Value::Value(v) => {
let o = OwnedValue::from(&**v);
Value::Value(Box::new(o.into_inner()))
}
}
}
}

struct OwnedValue(Value<'static>);
impl OwnedValue {
pub(crate) fn into_inner(self) -> Value<'static> {
todo!()
}
}
impl<'a, T> TryFrom<OwnedValue> for Vec<T>
where
T: TryFrom<Value<'a>, Error = ()>,
{
type Error = ();
fn try_from(_: OwnedValue) -> Result<Self, Self::Error> {
todo!()
}
}
impl TryFrom<OwnedValue> for Vec<OwnedValue> {
type Error = ();
fn try_from(_: OwnedValue) -> Result<Self, Self::Error> {
todo!()
}
}
impl<'a> From<Value<'a>> for OwnedValue {
fn from(_: Value<'a>) -> Self {
todo!()
}
}
impl<'a> From<&Value<'a>> for OwnedValue {
fn from(_: &Value<'a>) -> Self {
todo!()
}
}
11 changes: 11 additions & 0 deletions src/test/ui/traits/issue-89119.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// This is a regression test for issue #89119: an issue in intercrate mode caching.
//
// It requires multiple crates, of course, but the bug is triggered by the code in the dependency,
// not the main crate. This is why this file is empty.
//
// The auxiliary crate used in the test contains the code minimized from `zvariant-2.8.0`.

// check-pass
// aux-build: issue_89119_intercrate_caching.rs

fn main() {}

0 comments on commit 4571fea

Please sign in to comment.