nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-03 10:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #25076

Browse Source
This commit is contained in:
Ariel Ben-Yehuda 2015-05-05 22:09:17 +03:00 committed by Ariel Ben-Yehuda
parent 31e3cb7c4e
commit 4d8d68f80d
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc/middle/traits/error_reporting.rs
View File

@ -56,7 +56,10 @@ pub fn report_projection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
{
let predicate =
infcx.resolve_type_vars_if_possible(&obligation.predicate);
if !predicate.references_error() {
// The ty_err created by normalize_to_error can end up being unified
// into all obligations - we still have to report an error in that
// case.
if !infcx.tcx.sess.has_errors() || !predicate.references_error() {
span_err!(infcx.tcx.sess, obligation.cause.span, E0271,
"type mismatch resolving `{}`: {}",
predicate.user_string(infcx.tcx),
@ -183,7 +186,8 @@ pub fn report_selection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
let trait_predicate =
infcx.resolve_type_vars_if_possible(trait_predicate);
if !trait_predicate.references_error() {
if !infcx.tcx.sess.has_errors() ||
!trait_predicate.references_error() {
let trait_ref = trait_predicate.to_poly_trait_ref();
span_err!(infcx.tcx.sess, obligation.cause.span, E0277,
"the trait `{}` is not implemented for the type `{}`",

5
src/librustc/middle/traits/project.rs
View File

@ -408,7 +408,10 @@ fn opt_normalize_projection_type<'a,'b,'tcx>(
}
/// in various error cases, we just set ty_err and return an obligation
/// that, when fulfilled, will lead to an error
/// that, when fulfilled, will lead to an error.
///
/// FIXME: the ty_err created here can enter the obligation we create,
/// leading to error messages involving ty_err.
fn normalize_to_error<'a,'tcx>(selcx: &mut SelectionContext<'a,'tcx>,
projection_ty: ty::ProjectionTy<'tcx>,
cause: ObligationCause<'tcx>,

21
src/test/compile-fail/issue-25076.rs Normal file
View File

@ -0,0 +1,21 @@
// 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.
struct S;
trait InOut<T> { type Out; }
fn do_fold<B, F: InOut<B, Out=B>>(init: B, f: F) {}
fn bot<T>() -> T { loop {} }
fn main() {
do_fold(bot(), ()); //~ ERROR is not implemented for the type `()`
}