From e7d052ebd943762c4dbfd9a7a0525f3288a26ffa Mon Sep 17 00:00:00 2001 From: Johannes Oertel Date: Sat, 2 May 2015 15:06:00 +0200 Subject: [PATCH] Remove several FIXMEs --- .../run-pass/associated-types-impl-redirect.rs | 2 -- ...ciated-types-where-clause-impl-ambiguity.rs | 2 -- .../deriving-cmp-generic-struct-enum.rs | 3 --- .../run-pass/deriving-cmp-generic-struct.rs | 3 --- .../deriving-cmp-generic-tuple-struct.rs | 3 --- .../deriving-self-lifetime-totalord-totaleq.rs | 4 +--- src/test/run-pass/generic-recursive-tag.rs | 2 -- src/test/run-pass/issue-19081.rs | 2 -- src/test/run-pass/last-use-in-cap-clause.rs | 1 - src/test/run-pass/ufcs-polymorphic-paths.rs | 12 ++++-------- src/test/run-pass/unfold-cross-crate.rs | 3 --- src/test/run-pass/utf8.rs | 2 -- src/test/run-pass/vec-fixed-length.rs | 18 +++++++++++------- 13 files changed, 16 insertions(+), 41 deletions(-) diff --git a/src/test/run-pass/associated-types-impl-redirect.rs b/src/test/run-pass/associated-types-impl-redirect.rs index d9d11c95adb..4082580a123 100644 --- a/src/test/run-pass/associated-types-impl-redirect.rs +++ b/src/test/run-pass/associated-types-impl-redirect.rs @@ -14,8 +14,6 @@ // for `ByRef`. The right answer was to consider the result ambiguous // until more type information was available. -// ignore-pretty -- FIXME(#17362) - #![feature(lang_items, unboxed_closures)] #![no_implicit_prelude] diff --git a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs b/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs index 4152321cab8..082ad53d559 100644 --- a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs +++ b/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs @@ -14,8 +14,6 @@ // for `ByRef`. The right answer was to consider the result ambiguous // until more type information was available. -// ignore-pretty -- FIXME(#17362) pretty prints with `<<` which lexes wrong - #![feature(lang_items, unboxed_closures)] #![no_implicit_prelude] diff --git a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs index 14f7862ef21..f061b6cf4c1 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs +++ b/src/test/run-pass/deriving-cmp-generic-struct-enum.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// no-pretty-expanded FIXME #15189 - - #[derive(PartialEq, Eq, PartialOrd, Ord)] enum ES { ES1 { x: T }, diff --git a/src/test/run-pass/deriving-cmp-generic-struct.rs b/src/test/run-pass/deriving-cmp-generic-struct.rs index 5c7d806f519..d6c73f394ac 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct.rs +++ b/src/test/run-pass/deriving-cmp-generic-struct.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// no-pretty-expanded FIXME #15189 - - #[derive(PartialEq, Eq, PartialOrd, Ord)] struct S { x: T, diff --git a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs b/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs index b7bfb91b278..fc256228507 100644 --- a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs +++ b/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// no-pretty-expanded FIXME #15189 - - #[derive(PartialEq, Eq, PartialOrd, Ord)] struct TS(T,T); diff --git a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs b/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs index 7a0d35f6f49..3fdf840d596 100644 --- a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs +++ b/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs @@ -8,11 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-test FIXME #11820: & is unreliable in deriving - use std::cmp::Ordering::{Less,Equal,Greater}; -#[derive(Eq,Ord)] +#[derive(PartialEq, Eq, PartialOrd, Ord)] struct A<'a> { x: &'a isize } diff --git a/src/test/run-pass/generic-recursive-tag.rs b/src/test/run-pass/generic-recursive-tag.rs index 863e0d7e333..433bd7cd906 100644 --- a/src/test/run-pass/generic-recursive-tag.rs +++ b/src/test/run-pass/generic-recursive-tag.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-pretty FIXME(#14193) - #![allow(unknown_features)] #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-19081.rs b/src/test/run-pass/issue-19081.rs index 83ba322ba30..8e2fa2b6197 100644 --- a/src/test/run-pass/issue-19081.rs +++ b/src/test/run-pass/issue-19081.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-pretty -- FIXME(#17362) pretty prints as `Hash< } fn foo() -> Box isize + 'static> { let k: Box<_> = box 22; let _u = A {a: k.clone()}; - // FIXME(#16640) suffix in `22` suffix shouldn't be necessary let result = || 22; // FIXME (#22405): Replace `Box::new` with `box` here when/if possible. Box::new(result) diff --git a/src/test/run-pass/ufcs-polymorphic-paths.rs b/src/test/run-pass/ufcs-polymorphic-paths.rs index eec852ae181..a8240dfbd1f 100644 --- a/src/test/run-pass/ufcs-polymorphic-paths.rs +++ b/src/test/run-pass/ufcs-polymorphic-paths.rs @@ -17,9 +17,6 @@ use std::default::Default; use std::iter::FromIterator; use std::ops::Add; use std::option::IntoIter as OptionIter; -// FIXME the glob std::prelude::*; import of Vec is missing non-static inherent -// methods. -use std::vec::Vec; pub struct XorShiftRng; use XorShiftRng as DummyRng; @@ -81,11 +78,10 @@ tests! { Vec::map_in_place, fn(Vec, fn(u8) -> i8) -> Vec, (vec![b'f', b'o', b'o'], u8_as_i8); Vec::map_in_place:: i8>, fn(Vec, fn(u8) -> i8) -> Vec, (vec![b'f', b'o', b'o'], u8_as_i8); - // FIXME these break with "type parameter might not appear here pointing at ``. - // Vec::::map_in_place: fn(Vec, fn(u8) -> i8) -> Vec - // , (vec![b'f', b'o', b'o'], u8_as_i8); - // Vec::::map_in_place:: i8>: fn(Vec, fn(u8) -> i8) -> Vec - // , (vec![b'f', b'o', b'o'], u8_as_i8); + Vec::::map_in_place, fn(Vec, fn(u8) -> i8) -> Vec + , (vec![b'f', b'o', b'o'], u8_as_i8); + Vec::::map_in_place:: i8>, fn(Vec, fn(u8) -> i8) -> Vec + , (vec![b'f', b'o', b'o'], u8_as_i8); // Trait static methods. bool::size, fn() -> usize, (); diff --git a/src/test/run-pass/unfold-cross-crate.rs b/src/test/run-pass/unfold-cross-crate.rs index 5c699bf3044..938b5dc6167 100644 --- a/src/test/run-pass/unfold-cross-crate.rs +++ b/src/test/run-pass/unfold-cross-crate.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// no-pretty-expanded FIXME #15189 - - #![feature(core)] use std::iter::Unfold; diff --git a/src/test/run-pass/utf8.rs b/src/test/run-pass/utf8.rs index 4782edf4e12..ec1c6970ea0 100644 --- a/src/test/run-pass/utf8.rs +++ b/src/test/run-pass/utf8.rs @@ -7,8 +7,6 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// -// no-pretty-expanded FIXME #15189 pub fn main() { let yen: char = '¥'; // 0xa5 diff --git a/src/test/run-pass/vec-fixed-length.rs b/src/test/run-pass/vec-fixed-length.rs index fbaba9b8a61..befb27e6ccb 100644 --- a/src/test/run-pass/vec-fixed-length.rs +++ b/src/test/run-pass/vec-fixed-length.rs @@ -11,7 +11,16 @@ use std::mem::size_of; -pub fn main() { +#[cfg(not(target_pointer_width = "64"))] +fn test_big_vec() {} + +#[cfg(target_pointer_width = "64")] +fn test_big_vec() +{ + assert_eq!(size_of::<[u8; (1 << 32)]>(), (1 << 32)); +} + +fn main() { let x: [isize; 4] = [1, 2, 3, 4]; assert_eq!(x[0], 1); assert_eq!(x[1], 2); @@ -19,10 +28,5 @@ pub fn main() { assert_eq!(x[3], 4); assert_eq!(size_of::<[u8; 4]>(), 4); - - // FIXME #10183 - // FIXME #18069 - //if cfg!(target_pointer_width = "64") { - // assert_eq!(size_of::<[u8; (1 << 32)]>(), (1 << 32)); - //} + test_big_vec(); }