Skip to content

Commit

Permalink
Add tests for two random issues that seem to be fixed on this branch.
Browse files Browse the repository at this point in the history
Fixes #20346.
Fixes #20371.
  • Loading branch information
nikomatsakis committed Dec 31, 2014
1 parent 6cb425d commit 9675488
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 0 deletions.
46 changes: 46 additions & 0 deletions src/test/compile-fail/associated-types-issue-20346.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Copyright 2014 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.

// Test that we reliably check the value of the associated type.

#![crate_type = "lib"]
#![feature(associated_types)]
#![no_implicit_prelude]

use std::option::Option::{None, Some, mod};
use std::vec::Vec;

trait Iterator {
type Item;

fn next(&mut self) -> Option<Self::Item>;
}

fn is_iterator_of<A, I: Iterator<Item=A>>(_: &I) {}

struct Adapter<I> {
iter: I,
found_none: bool,
}

impl<T, I> Iterator for Adapter<I> where I: Iterator<Item=Option<T>> {
type Item = T;

fn next(&mut self) -> Option<T> {
loop {}
}
}

fn test_adapter<T, I: Iterator<Item=Option<T>>>(it: I) {
is_iterator_of::<Option<T>, _>(&it); // Sanity check
let adapter = Adapter { iter: it, found_none: false };
is_iterator_of::<T, _>(&adapter); // OK
is_iterator_of::<Option<T>, _>(&adapter); //~ ERROR type mismatch
}
17 changes: 17 additions & 0 deletions src/test/run-pass/associated-types-issue-20371.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2014 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.

// Test that we are able to have an impl that defines an associated type
// before the actual trait.

#![feature(associated_types)]
impl X for f64 { type Y = int; }
trait X {type Y; }
fn main() {}

0 comments on commit 9675488

Please sign in to comment.