Skip to content

Commit

Permalink
test the substs ppaux code both with and without -Z verbose
Browse files Browse the repository at this point in the history
  • Loading branch information
arielb1 committed Apr 6, 2016
1 parent 832b707 commit 30d8eff
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 48 deletions.
3 changes: 2 additions & 1 deletion src/librustc/traits/error_reporting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,8 @@ pub fn report_selection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
// If we can't show anything useful, try to find
// similar impls.

let impl_candidates = find_similar_impl_candidates(infcx, trait_ref);
let impl_candidates =
find_similar_impl_candidates(infcx, trait_ref);
if impl_candidates.len() > 0 {
report_similar_impl_candidates(obligation.cause.span,
&mut err, &impl_candidates);
Expand Down
63 changes: 63 additions & 0 deletions src/test/compile-fail/substs-ppaux.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// 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.
//
// revisions: verbose normal
//
//[verbose] compile-flags: -Z verbose
//
// TODO nikomatsakis: test with both verbose and without

trait Foo<'b, 'c, S=u32> {
fn bar<'a, T>() where T: 'a {}
fn baz() {}
}

impl<'a,'b,T,S> Foo<'a, 'b, S> for T {}

fn main() {}

fn foo<'z>() where &'z (): Sized {
let x: () = <i8 as Foo<'static, 'static, u8>>::bar::<'static, char>;
//[verbose]~^ ERROR mismatched types
//[verbose]~| expected `()`
//[verbose]~| found `fn() {<i8 as Foo<ReStatic, ReStatic, u8>>::bar::<ReStatic, char>}`
//[normal]~^^^^ ERROR mismatched types
//[normal]~| expected `()`
//[normal]~| found `fn() {<i8 as Foo<'static, 'static, u8>>::bar::<'static, char>}`


let x: () = <i8 as Foo<'static, 'static, u32>>::bar::<'static, char>;
//[verbose]~^ ERROR mismatched types
//[verbose]~| expected `()`
//[verbose]~| found `fn() {<i8 as Foo<ReStatic, ReStatic, u32>>::bar::<ReStatic, char>}`
//[normal]~^^^^ ERROR mismatched types
//[normal]~| expected `()`
//[normal]~| found `fn() {<i8 as Foo<'static, 'static>>::bar::<'static, char>}`

let x: () = <i8 as Foo<'static, 'static, u8>>::baz;
//[verbose]~^ ERROR mismatched types
//[verbose]~| expected `()`
//[verbose]~| found `fn() {<i8 as Foo<ReStatic, ReStatic, u8>>::baz}`
//[normal]~^^^^ ERROR mismatched types
//[normal]~| expected `()`
//[normal]~| found `fn() {<i8 as Foo<'static, 'static, u8>>::baz}`

let x: () = foo::<'static>;
//[verbose]~^ ERROR mismatched types
//[verbose]~| expected `()`
//[verbose]~| found `fn() {foo::<ReStatic>}`
//[normal]~^^^^ ERROR mismatched types
//[normal]~| expected `()`
//[normal]~| found `fn() {foo::<'static>}`

<str as Foo<u8>>::bar;
//[verbose]~^ ERROR `str: std::marker::Sized` is not satisfied
//[normal]~^^ ERROR `str: std::marker::Sized` is not satisfied
}
47 changes: 0 additions & 47 deletions src/test/compile-fail/substs-verbose.rs

This file was deleted.

0 comments on commit 30d8eff

Please sign in to comment.