squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Update chalk tests

Browse source
This commit is contained in:
Matthew Jasper 2022-02-09 10:19:31 +00:00
parent caa10dc572
commit f718b51690
45 changed files with 119 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs
View file

@ -1,6 +1,5 @@
// NOTE: rustc cannot currently handle bounds of the form `for<'a> <Foo as Bar<'a>>::Assoc: Baz`.
// This should hopefully be fixed with Chalk.
// ignore-compare-mode-chalk
#![feature(associated_type_bounds)]

6
src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr
View file

@ -1,5 +1,5 @@
error[E0277]: `<<Self as Case1>::C as Iterator>::Item` cannot be sent between threads safely
--> $DIR/bad-bounds-on-assoc-in-trait.rs:27:36
--> $DIR/bad-bounds-on-assoc-in-trait.rs:26:36
|
LL | type C: Clone + Iterator<Item: Send + Iterator<Item: for<'a> Lam<&'a u8, App: Debug>> + Sync>;
| ^^^^ `<<Self as Case1>::C as Iterator>::Item` cannot be sent between threads safely
@ -11,7 +11,7 @@ LL | trait Case1 where <<Self as Case1>::C as Iterator>::Item: Send {
| ++++++++++++++++++++++++++++++++++++++++++++++++++
error[E0277]: `<<Self as Case1>::C as Iterator>::Item` is not an iterator
--> $DIR/bad-bounds-on-assoc-in-trait.rs:27:43
--> $DIR/bad-bounds-on-assoc-in-trait.rs:26:43
|
LL | type C: Clone + Iterator<Item: Send + Iterator<Item: for<'a> Lam<&'a u8, App: Debug>> + Sync>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `<<Self as Case1>::C as Iterator>::Item` is not an iterator
@ -23,7 +23,7 @@ LL | trait Case1 where <<Self as Case1>::C as Iterator>::Item: Iterator {
| ++++++++++++++++++++++++++++++++++++++++++++++++++++++
error[E0277]: `<<Self as Case1>::C as Iterator>::Item` cannot be shared between threads safely
--> $DIR/bad-bounds-on-assoc-in-trait.rs:27:93
--> $DIR/bad-bounds-on-assoc-in-trait.rs:26:93
|
LL | type C: Clone + Iterator<Item: Send + Iterator<Item: for<'a> Lam<&'a u8, App: Debug>> + Sync>;
| ^^^^ `<<Self as Case1>::C as Iterator>::Item` cannot be shared between threads safely

1
src/test/ui/associated-type-bounds/trait-params.rs
View file

@ -1,5 +1,4 @@
// build-pass (FIXME(62277): could be check-pass?)
// ignore-compare-mode-chalk
#![feature(associated_type_bounds)]

1
src/test/ui/associated-type-bounds/union-bounds.rs
View file

@ -1,5 +1,4 @@
// run-pass
// ignore-compare-mode-chalk
#![feature(associated_type_bounds)]
#![feature(untagged_unions)]

2
src/test/ui/associated-types/associated-types-stream.rs
View file

@ -1,8 +1,6 @@
// run-pass
// Test references to the trait `Stream` in the bounds for associated
// types defined on `Stream`. Issue #20551.
// ignore-compare-mode-chalk
trait Stream {
type Car;

1
src/test/ui/associated-types/hr-associated-type-bound-param-2.rs
View file

@ -1,4 +1,3 @@
// ignore-compare-mode-chalk
trait Z<'a, T: ?Sized>
where
T: Z<'a, u16>,

12
src/test/ui/associated-types/hr-associated-type-bound-param-2.stderr
View file

@ -1,11 +1,11 @@
error[E0277]: the trait bound `str: Clone` is not satisfied
--> $DIR/hr-associated-type-bound-param-2.rs:4:8
--> $DIR/hr-associated-type-bound-param-2.rs:3:8
|
LL | T: Z<'a, u16>,
| ^^^^^^^^^^ the trait `Clone` is not implemented for `str`
|
note: required by a bound in `Z`
--> $DIR/hr-associated-type-bound-param-2.rs:7:35
--> $DIR/hr-associated-type-bound-param-2.rs:6:35
|
LL | trait Z<'a, T: ?Sized>
| - required by a bound in this
@ -14,13 +14,13 @@ LL | for<'b> <T as Z<'b, u16>>::W: Clone,
| ^^^^^ required by this bound in `Z`
error[E0277]: the trait bound `str: Clone` is not satisfied
--> $DIR/hr-associated-type-bound-param-2.rs:4:8
--> $DIR/hr-associated-type-bound-param-2.rs:3:8
|
LL | T: Z<'a, u16>,
| ^^^^^^^^^^ the trait `Clone` is not implemented for `str`
|
note: required by a bound in `Z`
--> $DIR/hr-associated-type-bound-param-2.rs:7:35
--> $DIR/hr-associated-type-bound-param-2.rs:6:35
|
LL | trait Z<'a, T: ?Sized>
| - required by a bound in this
@ -29,13 +29,13 @@ LL | for<'b> <T as Z<'b, u16>>::W: Clone,
| ^^^^^ required by this bound in `Z`
error[E0277]: the trait bound `str: Clone` is not satisfied
--> $DIR/hr-associated-type-bound-param-2.rs:16:14
--> $DIR/hr-associated-type-bound-param-2.rs:15:14
|
LL | type W = str;
| ^^^ the trait `Clone` is not implemented for `str`
|
note: required by a bound in `Z`
--> $DIR/hr-associated-type-bound-param-2.rs:7:35
--> $DIR/hr-associated-type-bound-param-2.rs:6:35
|
LL | trait Z<'a, T: ?Sized>
| - required by a bound in this

1
src/test/ui/associated-types/hr-associated-type-bound-param-5.rs
View file

@ -1,4 +1,3 @@
// ignore-compare-mode-chalk
trait Cycle: Sized {
type Next: Cycle<Next = Self>;
}

8
src/test/ui/associated-types/hr-associated-type-bound-param-5.stderr
View file

@ -1,11 +1,11 @@
error[E0277]: the trait bound `str: Clone` is not satisfied
--> $DIR/hr-associated-type-bound-param-5.rs:27:14
--> $DIR/hr-associated-type-bound-param-5.rs:26:14
|
LL | type U = str;
| ^^^ the trait `Clone` is not implemented for `str`
|
note: required by a bound in `X`
--> $DIR/hr-associated-type-bound-param-5.rs:18:45
--> $DIR/hr-associated-type-bound-param-5.rs:17:45
|
LL | trait X<'a, T: Cycle + for<'b> X<'b, T>>
| - required by a bound in this
@ -14,13 +14,13 @@ LL | for<'b> <T::Next as X<'b, T::Next>>::U: Clone,
| ^^^^^ required by this bound in `X`
error[E0277]: the trait bound `str: Clone` is not satisfied
--> $DIR/hr-associated-type-bound-param-5.rs:32:14
--> $DIR/hr-associated-type-bound-param-5.rs:31:14
|
LL | type U = str;
| ^^^ the trait `Clone` is not implemented for `str`
|
note: required by a bound in `X`
--> $DIR/hr-associated-type-bound-param-5.rs:18:45
--> $DIR/hr-associated-type-bound-param-5.rs:17:45
|
LL | trait X<'a, T: Cycle + for<'b> X<'b, T>>
| - required by a bound in this

1
src/test/ui/associated-types/issue-50301.rs
View file

@ -1,6 +1,5 @@
// Tests that HRTBs are correctly accepted -- https://github.com/rust-lang/rust/issues/50301
// check-pass
// ignore-compare-mode-chalk
trait Trait
where
for<'a> &'a Self::IntoIter: IntoIterator<Item = u32>,

6
src/test/ui/chalkify/assert.rs Normal file
View file

@ -0,0 +1,6 @@
// run-pass
// compile-flags: -Z chalk
fn main() {
assert_eq!(1, 1);
}

3
src/test/ui/chalkify/println.rs
View file

@ -2,6 +2,5 @@
// compile-flags: -Z chalk
fn main() {
// FIXME(chalk): Require `RegionOutlives`/`TypeOutlives`/`Subtype` support
//println!("hello");
println!("hello");
}

3
src/test/ui/chalkify/trait-objects.rs
View file

@ -5,8 +5,7 @@ use std::fmt::Display;
fn main() {
let d: &dyn Display = &mut 3;
// FIXME(chalk) should be able to call d.to_string() as well, but doing so
// requires Chalk to be able to prove trait object well-formed goals.
d.to_string();
(&d).to_string();
let f: &dyn Fn(i32) -> _ = &|x| x + x;
f(2);

9
src/test/ui/consts/const-eval/ub-nonnull.chalk.64bit.stderr Normal file
View file

@ -0,0 +1,9 @@
error[E0284]: type annotations needed: cannot satisfy `<usize as SliceIndex<[u8]>>::Output == _`
--> $DIR/ub-nonnull.rs:19:30
|
LL | let out_of_bounds_ptr = &ptr[255];
| ^^^^^^^^ cannot satisfy `<usize as SliceIndex<[u8]>>::Output == _`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0284`.

9
src/test/ui/consts/const-eval/ub-wide-ptr.chalk.64bit.stderr Normal file
View file

@ -0,0 +1,9 @@
error[E0282]: type annotations needed
--> $DIR/ub-wide-ptr.rs:90:67
|
LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
| ^^^^^^^^^^^^^^ cannot infer type for type parameter `U` declared on the function `transmute`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0282`.

1
src/test/ui/deriving/deriving-associated-types.rs
View file

@ -1,5 +1,4 @@
// run-pass
// ignore-compare-mode-chalk
pub trait DeclaredTrait {
type Type;
}

1
src/test/ui/impl-trait/example-calendar.rs
View file

@ -1,5 +1,4 @@
// run-pass
// ignore-compare-mode-chalk
#![feature(fn_traits,
step_trait,

1
src/test/ui/impl-trait/issue-55872-2.rs
View file

@ -1,5 +1,4 @@
// edition:2018
// ignore-compare-mode-chalk
#![feature(type_alias_impl_trait)]

4
src/test/ui/impl-trait/issue-55872-2.stderr
View file

@ -1,11 +1,11 @@
error[E0277]: the trait bound `impl Future<Output = [async output]>: Copy` is not satisfied
--> $DIR/issue-55872-2.rs:14:20
--> $DIR/issue-55872-2.rs:13:20
|
LL | fn foo<T>() -> Self::E {
| ^^^^^^^ the trait `Copy` is not implemented for `impl Future<Output = [async output]>`
error: type parameter `T` is part of concrete type but not used in parameter list for the `impl Trait` type alias
--> $DIR/issue-55872-2.rs:14:28
--> $DIR/issue-55872-2.rs:13:28
|
LL | fn foo<T>() -> Self::E {
| ____________________________^

1
src/test/ui/impl-trait/issue-55872.rs
View file

@ -1,4 +1,3 @@
// ignore-compare-mode-chalk
#![feature(type_alias_impl_trait)]
pub trait Bar {

2
src/test/ui/impl-trait/issue-55872.stderr
View file

@ -1,5 +1,5 @@
error: type parameter `T` is part of concrete type but not used in parameter list for the `impl Trait` type alias
--> $DIR/issue-55872.rs:13:28
--> $DIR/issue-55872.rs:12:28
|
LL | fn foo<T>() -> Self::E {
| ____________________________^

1
src/test/ui/impl-trait/issues/issue-65581.rs
View file

@ -1,4 +1,5 @@
// check-pass
// ignore-compare-mode-chalk
#![allow(dead_code)]

6
src/test/ui/issues/issue-23122-1.rs
View file

@ -1,10 +1,10 @@
// ignore-compare-mode-chalk
trait Next {
type Next: Next;
}
struct GetNext<T: Next> { t: T }
struct GetNext<T: Next> {
t: T,
}
impl<T: Next> Next for GetNext<T> {
type Next = <GetNext<T> as Next>::Next;

5
src/test/ui/issues/issue-23122-2.rs
View file

@ -1,9 +1,10 @@
// ignore-compare-mode-chalk
trait Next {
type Next: Next;
}
struct GetNext<T: Next> { t: T }
struct GetNext<T: Next> {
t: T,
}
impl<T: Next> Next for GetNext<T> {
type Next = <GetNext<T::Next> as Next>::Next;

4
src/test/ui/issues/issue-23122-2.stderr
View file

@ -1,12 +1,12 @@
error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next: Sized`
--> $DIR/issue-23122-2.rs:9:17
--> $DIR/issue-23122-2.rs:10:17
|
LL | type Next = <GetNext<T::Next> as Next>::Next;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_23122_2`)
note: required because of the requirements on the impl of `Next` for `GetNext<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next>`
--> $DIR/issue-23122-2.rs:8:15
--> $DIR/issue-23122-2.rs:9:15
|
LL | impl<T: Next> Next for GetNext<T> {
| ^^^^ ^^^^^^^^^^

1
src/test/ui/issues/issue-28561.rs
View file

@ -1,5 +1,4 @@
// check-pass
// ignore-compare-mode-chalk
#[derive(Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
struct Array<T> {
f00: [T; 00],

14
src/test/ui/issues/issue-33187.rs
View file

@ -1,10 +1,15 @@
// run-pass
// ignore-compare-mode-chalk
struct Foo<A: Repr>(<A as Repr>::Data);
impl<A> Copy for Foo<A> where <A as Repr>::Data: Copy {}
impl<A> Clone for Foo<A> where <A as Repr>::Data: Clone {
fn clone(&self) -> Self { Foo(self.0.clone()) }
impl<A> Clone for Foo<A>
where
<A as Repr>::Data: Clone,
{
fn clone(&self) -> Self {
Foo(self.0.clone())
}
}
trait Repr {
@ -15,5 +20,4 @@ impl<A> Repr for A {
type Data = u32;
}
fn main() {
}
fn main() {}

1
src/test/ui/issues/issue-37051.rs
View file

@ -1,5 +1,4 @@
// check-pass
// ignore-compare-mode-chalk
#![feature(associated_type_defaults)]

4
src/test/ui/issues/issue-55796.nll.stderr
View file

@ -1,5 +1,5 @@
error: lifetime may not live long enough
--> $DIR/issue-55796.rs:18:9
--> $DIR/issue-55796.rs:16:9
|
LL | pub trait Graph<'a> {
| -- lifetime `'a` defined here
@ -8,7 +8,7 @@ LL | Box::new(self.out_edges(u).map(|e| e.target()))
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ returning this value requires that `'a` must outlive `'static`
error: lifetime may not live long enough
--> $DIR/issue-55796.rs:23:9
--> $DIR/issue-55796.rs:21:9
|
LL | pub trait Graph<'a> {
| -- lifetime `'a` defined here

2
src/test/ui/issues/issue-55796.rs
View file

@ -1,5 +1,3 @@
// ignore-compare-mode-chalk
pub trait EdgeTrait<N> {
fn target(&self) -> N;
}

20
src/test/ui/issues/issue-55796.stderr
View file

@ -1,22 +1,22 @@
error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements
--> $DIR/issue-55796.rs:18:9
--> $DIR/issue-55796.rs:16:9
|
LL | Box::new(self.out_edges(u).map(|e| e.target()))
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
note: first, the lifetime cannot outlive the lifetime `'a` as defined here...
--> $DIR/issue-55796.rs:7:17
--> $DIR/issue-55796.rs:5:17
|
LL | pub trait Graph<'a> {
| ^^
note: ...so that the type `Map<<Self as Graph<'a>>::EdgesIter, [closure@$DIR/issue-55796.rs:18:40: 18:54]>` will meet its required lifetime bounds
--> $DIR/issue-55796.rs:18:9
note: ...so that the type `Map<<Self as Graph<'a>>::EdgesIter, [closure@$DIR/issue-55796.rs:16:40: 16:54]>` will meet its required lifetime bounds
--> $DIR/issue-55796.rs:16:9
|
LL | Box::new(self.out_edges(u).map(|e| e.target()))
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: but, the lifetime must be valid for the static lifetime...
note: ...so that the types are compatible
--> $DIR/issue-55796.rs:18:9
--> $DIR/issue-55796.rs:16:9
|
LL | Box::new(self.out_edges(u).map(|e| e.target()))
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -24,24 +24,24 @@ LL | Box::new(self.out_edges(u).map(|e| e.target()))
found `Box<dyn Iterator<Item = <Self as Graph<'a>>::Node>>`
error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements
--> $DIR/issue-55796.rs:23:9
--> $DIR/issue-55796.rs:21:9
|
LL | Box::new(self.in_edges(u).map(|e| e.target()))
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
note: first, the lifetime cannot outlive the lifetime `'a` as defined here...
--> $DIR/issue-55796.rs:7:17
--> $DIR/issue-55796.rs:5:17
|
LL | pub trait Graph<'a> {
| ^^
note: ...so that the type `Map<<Self as Graph<'a>>::EdgesIter, [closure@$DIR/issue-55796.rs:23:39: 23:53]>` will meet its required lifetime bounds
--> $DIR/issue-55796.rs:23:9
note: ...so that the type `Map<<Self as Graph<'a>>::EdgesIter, [closure@$DIR/issue-55796.rs:21:39: 21:53]>` will meet its required lifetime bounds
--> $DIR/issue-55796.rs:21:9
|
LL | Box::new(self.in_edges(u).map(|e| e.target()))
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: but, the lifetime must be valid for the static lifetime...
note: ...so that the types are compatible
--> $DIR/issue-55796.rs:23:9
--> $DIR/issue-55796.rs:21:9
|
LL | Box::new(self.in_edges(u).map(|e| e.target()))
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1
src/test/ui/issues/issue-74564-if-expr-stack-overflow.rs
View file

@ -1,6 +1,5 @@
// build-pass
// ignore-tidy-filelength
// ignore-compare-mode-chalk
#![crate_type = "rlib"]
fn banana(v: &str) -> u32 {

47
src/test/ui/nll/ty-outlives/issue-53789-2.rs
View file

@ -1,16 +1,14 @@
// Regression test for #53789.
//
// check-pass
// ignore-compare-mode-chalk
use std::cmp::Ord;
use std::collections::BTreeMap;
use std::ops::Range;
use std::cmp::Ord;
macro_rules! valuetree {
() => {
type ValueTree =
<Self::Strategy as $crate::Strategy>::Value;
type ValueTree = <Self::Strategy as $crate::Strategy>::Value;
};
}
@ -41,7 +39,9 @@ macro_rules! product_type {
macro_rules! default {
($type: ty, $val: expr) => {
impl Default for $type {
fn default() -> Self { $val.into() }
fn default() -> Self {
$val.into()
}
}
};
}
@ -99,12 +99,8 @@ struct VecStrategy<T : Strategy> {
size: Range<usize>,
}
fn vec<T : Strategy>(element: T, size: Range<usize>)
-> VecStrategy<T> {
VecStrategy {
element: element,
size: size,
}
fn vec<T: Strategy>(element: T, size: Range<usize>) -> VecStrategy<T> {
VecStrategy { element: element, size: size }
}
type ValueFor<S> = <<S as Strategy>::Value as ValueTree>::Value;
@ -124,7 +120,6 @@ type StrategyType<'a, A> = <A as Arbitrary<'a>>::Strategy;
struct SizeBounds(Range<usize>);
default!(SizeBounds, 0..100);
impl From<Range<usize>> for SizeBounds {
fn from(high: Range<usize>) -> Self {
unimplemented!()
@ -137,19 +132,21 @@ impl From<SizeBounds> for Range<usize> {
}
}
fn any_with<'a, A: Arbitrary<'a>>(args: A::Parameters)
-> StrategyType<'a, A> {
fn any_with<'a, A: Arbitrary<'a>>(args: A::Parameters) -> StrategyType<'a, A> {
unimplemented!()
}
impl<K: ValueTree, V: ValueTree> Strategy for (K, V) where
<K as ValueTree>::Value: Ord {
impl<K: ValueTree, V: ValueTree> Strategy for (K, V)
where
<K as ValueTree>::Value: Ord,
{
type Value = TupleValueTree<(K, V)>;
}
impl<K: ValueTree, V: ValueTree> ValueTree for TupleValueTree<(K, V)> where
<K as ValueTree>::Value: Ord {
impl<K: ValueTree, V: ValueTree> ValueTree for TupleValueTree<(K, V)>
where
<K as ValueTree>::Value: Ord,
{
type Value = BTreeMapValueTree<K, V>;
}
@ -208,10 +205,14 @@ mapfn! {
}
}
fn btree_map<K : Strategy + 'static, V : Strategy + 'static>
(key: K, value: V, size: Range<usize>)
-> BTreeMapStrategy<K, V>
where ValueFor<K> : Ord {
fn btree_map<K: Strategy + 'static, V: Strategy + 'static>(
key: K,
value: V,
size: Range<usize>,
) -> BTreeMapStrategy<K, V>
where
ValueFor<K>: Ord,
{
unimplemented!()
}

1
src/test/ui/specialization/deafult-associated-type-bound-1.rs → src/test/ui/specialization/default-associated-type-bound-1.rs
View file

@ -1,6 +1,5 @@
// Check that we check that default associated types satisfy the required
// bounds on them.
// ignore-compare-mode-chalk
#![feature(specialization)]
//~^ WARNING `specialization` is incomplete

6
src/test/ui/specialization/deafult-associated-type-bound-1.stderr → src/test/ui/specialization/default-associated-type-bound-1.stderr
View file

@ -1,5 +1,5 @@
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/deafult-associated-type-bound-1.rs:5:12
--> $DIR/default-associated-type-bound-1.rs:4:12
|
LL | #![feature(specialization)]
| ^^^^^^^^^^^^^^
@ -9,13 +9,13 @@ LL | #![feature(specialization)]
= help: consider using `min_specialization` instead, which is more stable and complete
error[E0277]: the trait bound `str: Clone` is not satisfied
--> $DIR/deafult-associated-type-bound-1.rs:19:22
--> $DIR/default-associated-type-bound-1.rs:18:22
|
LL | default type U = str;
| ^^^ the trait `Clone` is not implemented for `str`
|
note: required by a bound in `X::U`
--> $DIR/deafult-associated-type-bound-1.rs:9:13
--> $DIR/default-associated-type-bound-1.rs:8:13
|
LL | type U: Clone;
| ^^^^^ required by this bound in `X::U`

0
src/test/ui/specialization/deafult-associated-type-bound-2.rs → src/test/ui/specialization/default-associated-type-bound-2.rs
View file

6
src/test/ui/specialization/deafult-associated-type-bound-2.stderr → src/test/ui/specialization/default-associated-type-bound-2.stderr
View file

@ -1,5 +1,5 @@
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/deafult-associated-type-bound-2.rs:2:12
--> $DIR/default-associated-type-bound-2.rs:2:12
|
LL | #![feature(specialization)]
| ^^^^^^^^^^^^^^
@ -9,14 +9,14 @@ LL | #![feature(specialization)]
= help: consider using `min_specialization` instead, which is more stable and complete
error[E0277]: can't compare `&'static B` with `B`
--> $DIR/deafult-associated-type-bound-2.rs:16:22
--> $DIR/default-associated-type-bound-2.rs:16:22
|
LL | default type U = &'static B;
| ^^^^^^^^^^ no implementation for `&'static B == B`
|
= help: the trait `PartialEq<B>` is not implemented for `&'static B`
note: required by a bound in `X::U`
--> $DIR/deafult-associated-type-bound-2.rs:6:13
--> $DIR/default-associated-type-bound-2.rs:6:13
|
LL | type U: PartialEq<T>;
| ^^^^^^^^^^^^ required by this bound in `X::U`

0
src/test/ui/specialization/deafult-generic-associated-type-bound.rs → src/test/ui/specialization/default-generic-associated-type-bound.rs
View file

6
src/test/ui/specialization/deafult-generic-associated-type-bound.stderr → src/test/ui/specialization/default-generic-associated-type-bound.stderr
View file

@ -1,5 +1,5 @@
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/deafult-generic-associated-type-bound.rs:3:12
--> $DIR/default-generic-associated-type-bound.rs:3:12
|
LL | #![feature(specialization)]
| ^^^^^^^^^^^^^^
@ -9,14 +9,14 @@ LL | #![feature(specialization)]
= help: consider using `min_specialization` instead, which is more stable and complete
error[E0277]: can't compare `T` with `T`
--> $DIR/deafult-generic-associated-type-bound.rs:18:26
--> $DIR/default-generic-associated-type-bound.rs:18:26
|
LL | default type U<'a> = &'a T;
| ^^^^^ no implementation for `T == T`
|
= note: required because of the requirements on the impl of `PartialEq` for `&'a T`
note: required by a bound in `X::U`
--> $DIR/deafult-generic-associated-type-bound.rs:8:17
--> $DIR/default-generic-associated-type-bound.rs:8:17
|
LL | type U<'a>: PartialEq<&'a Self> where Self: 'a;
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `X::U`

1
src/test/ui/type-alias-impl-trait/issue-53598.rs
View file

@ -1,4 +1,3 @@
// ignore-compare-mode-chalk
#![feature(type_alias_impl_trait)]
use std::fmt::Debug;

2
src/test/ui/type-alias-impl-trait/issue-53598.stderr
View file

@ -1,5 +1,5 @@
error: type parameter `T` is part of concrete type but not used in parameter list for the `impl Trait` type alias
--> $DIR/issue-53598.rs:20:42
--> $DIR/issue-53598.rs:19:42
|
LL | fn foo<T: Debug>(_: T) -> Self::Item {
| __________________________________________^

1
src/test/ui/type-alias-impl-trait/issue-57700.rs
View file

@ -1,4 +1,3 @@
// ignore-compare-mode-chalk
#![feature(arbitrary_self_types)]
#![feature(type_alias_impl_trait)]

2
src/test/ui/type-alias-impl-trait/issue-57700.stderr
View file

@ -1,5 +1,5 @@
error: type parameter `impl Deref<Target = Self>` is part of concrete type but not used in parameter list for the `impl Trait` type alias
--> $DIR/issue-57700.rs:16:58
--> $DIR/issue-57700.rs:15:58
|
LL | fn foo(self: impl Deref<Target = Self>) -> Self::Bar {
| __________________________________________________________^

2
src/test/ui/type-alias-impl-trait/issue-60371.rs
View file

@ -1,5 +1,3 @@
// ignore-compare-mode-chalk
trait Bug {
type Item: Bug;

6
src/test/ui/type-alias-impl-trait/issue-60371.stderr
View file

@ -1,5 +1,5 @@
error[E0658]: `impl Trait` in type aliases is unstable
--> $DIR/issue-60371.rs:10:17
--> $DIR/issue-60371.rs:8:17
|
LL | type Item = impl Bug;
| ^^^^^^^^
@ -8,7 +8,7 @@ LL | type Item = impl Bug;
= help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
error[E0277]: the trait bound `(): Bug` is not satisfied
--> $DIR/issue-60371.rs:12:40
--> $DIR/issue-60371.rs:10:40
|
LL | const FUN: fn() -> Self::Item = || ();
| ^ the trait `Bug` is not implemented for `()`
@ -17,7 +17,7 @@ LL | const FUN: fn() -> Self::Item = || ();
<&() as Bug>
error: non-defining opaque type use in defining scope
--> $DIR/issue-60371.rs:12:37
--> $DIR/issue-60371.rs:10:37
|
LL | impl Bug for &() {
| - cannot use static lifetime; use a bound lifetime instead or remove the lifetime parameter from the opaque type