From 36f2af19995d5273e9def5396c62f8766218ca59 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Fri, 18 Nov 2016 13:35:42 -0500 Subject: [PATCH] remove FIXMEs; issue fixed --- .../change_pub_inherent_method_body/struct_point.rs | 7 +++---- .../change_pub_inherent_method_sig/struct_point.rs | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/test/incremental/change_pub_inherent_method_body/struct_point.rs b/src/test/incremental/change_pub_inherent_method_body/struct_point.rs index 77b616e5c5fd..665eafb4f4ee 100644 --- a/src/test/incremental/change_pub_inherent_method_body/struct_point.rs +++ b/src/test/incremental/change_pub_inherent_method_body/struct_point.rs @@ -21,8 +21,8 @@ // FIXME(#35078) -- this gets recompiled because we don't separate sig from body #![rustc_partition_translated(module="struct_point-fn_calls_changed_method", cfg="rpass2")] -// FIXME(#36349) -- this gets recompiled because we don't separate items from impl -#![rustc_partition_translated(module="struct_point-fn_calls_another_method", cfg="rpass2")] + +#![rustc_partition_reused(module="struct_point-fn_calls_another_method", cfg="rpass2")] #![rustc_partition_reused(module="struct_point-fn_make_struct", cfg="rpass2")] #![rustc_partition_reused(module="struct_point-fn_read_field", cfg="rpass2")] #![rustc_partition_reused(module="struct_point-fn_write_field", cfg="rpass2")] @@ -64,8 +64,7 @@ mod fn_calls_changed_method { mod fn_calls_another_method { use point::Point; - // FIXME(#36349) -- this gets recompiled because we don't separate items from impl - #[rustc_dirty(label="TypeckItemBody", cfg="rpass2")] + #[rustc_clean(label="TypeckItemBody", cfg="rpass2")] pub fn check() { let p = Point { x: 2.0, y: 2.0 }; p.x(); diff --git a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs b/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs index cb36a734e7b4..54e06e16998c 100644 --- a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs +++ b/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs @@ -22,9 +22,7 @@ #![rustc_partition_translated(module="struct_point-point", cfg="rpass2")] #![rustc_partition_translated(module="struct_point-fn_calls_changed_method", cfg="rpass2")] -// FIXME(#36349) -- this gets recompiled because we don't separate items from impl -#![rustc_partition_translated(module="struct_point-fn_calls_another_method", cfg="rpass2")] - +#![rustc_partition_reused(module="struct_point-fn_calls_another_method", cfg="rpass2")] #![rustc_partition_reused(module="struct_point-fn_make_struct", cfg="rpass2")] #![rustc_partition_reused(module="struct_point-fn_read_field", cfg="rpass2")] #![rustc_partition_reused(module="struct_point-fn_write_field", cfg="rpass2")] @@ -74,8 +72,7 @@ mod fn_calls_changed_method { mod fn_calls_another_method { use point::Point; - // FIXME(#36349) -- this gets recompiled because we don't separate items from impl - #[rustc_dirty(label="TypeckItemBody", cfg="rpass2")] + #[rustc_clean(label="TypeckItemBody", cfg="rpass2")] pub fn check() { let p = Point { x: 2.0, y: 2.0 }; p.x();