diff options
Diffstat (limited to 'tests/incremental/change_pub_inherent_method_sig')
-rw-r--r-- | tests/incremental/change_pub_inherent_method_sig/struct_point.rs | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/tests/incremental/change_pub_inherent_method_sig/struct_point.rs b/tests/incremental/change_pub_inherent_method_sig/struct_point.rs new file mode 100644 index 000000000..0a6729567 --- /dev/null +++ b/tests/incremental/change_pub_inherent_method_sig/struct_point.rs @@ -0,0 +1,101 @@ +// Test where we change the *signature* of a public, inherent method. + +// revisions:cfail1 cfail2 +// compile-flags: -Z query-dep-graph +// build-pass + +#![crate_type = "rlib"] +#![feature(rustc_attrs)] +#![feature(stmt_expr_attributes)] +#![allow(dead_code)] + +// These are expected to require codegen. +#![rustc_partition_codegened(module="struct_point-point", cfg="cfail2")] +#![rustc_partition_codegened(module="struct_point-fn_calls_changed_method", cfg="cfail2")] + +#![rustc_partition_reused(module="struct_point-fn_calls_another_method", cfg="cfail2")] +#![rustc_partition_reused(module="struct_point-fn_make_struct", cfg="cfail2")] +#![rustc_partition_reused(module="struct_point-fn_read_field", cfg="cfail2")] +#![rustc_partition_reused(module="struct_point-fn_write_field", cfg="cfail2")] + +pub mod point { + pub struct Point { + pub x: f32, + pub y: f32, + } + + impl Point { + #[cfg(cfail1)] + pub fn distance_from_point(&self, p: Option<Point>) -> f32 { + let p = p.unwrap_or(Point { x: 0.0, y: 0.0 }); + let x_diff = self.x - p.x; + let y_diff = self.y - p.y; + return x_diff * x_diff + y_diff * y_diff; + } + + #[cfg(cfail2)] + pub fn distance_from_point(&self, p: Option<&Point>) -> f32 { + const ORIGIN: &Point = &Point { x: 0.0, y: 0.0 }; + let p = p.unwrap_or(ORIGIN); + let x_diff = self.x - p.x; + let y_diff = self.y - p.y; + return x_diff * x_diff + y_diff * y_diff; + } + + pub fn x(&self) -> f32 { + self.x + } + } +} + +/// A fn item that calls the method that was changed +pub mod fn_calls_changed_method { + use point::Point; + + #[rustc_clean(except="typeck,optimized_mir", cfg="cfail2")] + pub fn check() { + let p = Point { x: 2.0, y: 2.0 }; + p.distance_from_point(None); + } +} + +/// A fn item that calls a method that was not changed +pub mod fn_calls_another_method { + use point::Point; + + #[rustc_clean(cfg="cfail2")] + pub fn check() { + let p = Point { x: 2.0, y: 2.0 }; + p.x(); + } +} + +/// A fn item that makes an instance of `Point` but does not invoke methods +pub mod fn_make_struct { + use point::Point; + + #[rustc_clean(cfg="cfail2")] + pub fn make_origin() -> Point { + Point { x: 2.0, y: 2.0 } + } +} + +/// A fn item that reads fields from `Point` but does not invoke methods +pub mod fn_read_field { + use point::Point; + + #[rustc_clean(cfg="cfail2")] + pub fn get_x(p: Point) -> f32 { + p.x + } +} + +/// A fn item that writes to a field of `Point` but does not invoke methods +pub mod fn_write_field { + use point::Point; + + #[rustc_clean(cfg="cfail2")] + pub fn inc_x(p: &mut Point) { + p.x += 1.0; + } +} |