diff options
| author | Albert Larsan <74931857+albertlarsan68@users.noreply.github.com> | 2023-01-05 09:13:28 +0100 |
|---|---|---|
| committer | Albert Larsan <74931857+albertlarsan68@users.noreply.github.com> | 2023-01-11 09:32:08 +0000 |
| commit | cf2dff2b1e3fa55fa5415d524200070d0d7aacfe (patch) | |
| tree | 40a88d9a46aaf3e8870676eb2538378b75a263eb /src/test/incremental/change_pub_inherent_method_sig | |
| parent | ca855e6e42787ecd062d81d53336fe6788ef51a9 (diff) | |
| download | rust-cf2dff2b1e3fa55fa5415d524200070d0d7aacfe.tar.gz rust-cf2dff2b1e3fa55fa5415d524200070d0d7aacfe.zip | |
Move /src/test to /tests
Diffstat (limited to 'src/test/incremental/change_pub_inherent_method_sig')
| -rw-r--r-- | src/test/incremental/change_pub_inherent_method_sig/struct_point.rs | 101 |
1 files changed, 0 insertions, 101 deletions
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 deleted file mode 100644 index 0a672956768..00000000000 --- a/src/test/incremental/change_pub_inherent_method_sig/struct_point.rs +++ /dev/null @@ -1,101 +0,0 @@ -// 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; - } -} |
