2016-11-18 08:42:47 -06:00
|
|
|
// Test where we change the *signature* of a public, inherent method.
|
2016-11-17 14:16:44 -06:00
|
|
|
|
2017-10-27 11:57:15 -05:00
|
|
|
// revisions:cfail1 cfail2
|
2016-11-17 14:16:44 -06:00
|
|
|
// compile-flags: -Z query-dep-graph
|
2020-11-20 06:33:48 -06:00
|
|
|
// build-pass
|
2016-11-17 14:16:44 -06:00
|
|
|
|
2017-10-27 11:57:15 -05:00
|
|
|
#![crate_type = "rlib"]
|
2016-11-17 14:16:44 -06:00
|
|
|
#![feature(rustc_attrs)]
|
|
|
|
#![feature(stmt_expr_attributes)]
|
|
|
|
#![allow(dead_code)]
|
|
|
|
|
2018-05-08 08:10:16 -05:00
|
|
|
// 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")]
|
2016-11-17 14:16:44 -06:00
|
|
|
|
2017-10-27 11:57:15 -05:00
|
|
|
#![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")]
|
2016-11-17 14:16:44 -06:00
|
|
|
|
2017-10-27 11:57:15 -05:00
|
|
|
pub mod point {
|
2016-11-17 14:16:44 -06:00
|
|
|
pub struct Point {
|
|
|
|
pub x: f32,
|
|
|
|
pub y: f32,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Point {
|
2017-10-27 11:57:15 -05:00
|
|
|
#[cfg(cfail1)]
|
2016-11-17 14:16:44 -06:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2017-10-27 11:57:15 -05:00
|
|
|
#[cfg(cfail2)]
|
2016-11-17 14:16:44 -06:00
|
|
|
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
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-18 08:42:47 -06:00
|
|
|
/// A fn item that calls the method that was changed
|
2017-10-27 11:57:15 -05:00
|
|
|
pub mod fn_calls_changed_method {
|
2016-11-17 14:16:44 -06:00
|
|
|
use point::Point;
|
|
|
|
|
2021-05-15 06:20:42 -05:00
|
|
|
#[rustc_clean(except="typeck,optimized_mir", cfg="cfail2")]
|
2016-11-17 14:16:44 -06:00
|
|
|
pub fn check() {
|
|
|
|
let p = Point { x: 2.0, y: 2.0 };
|
|
|
|
p.distance_from_point(None);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-18 08:42:47 -06:00
|
|
|
/// A fn item that calls a method that was not changed
|
2017-10-27 11:57:15 -05:00
|
|
|
pub mod fn_calls_another_method {
|
2016-11-17 14:16:44 -06:00
|
|
|
use point::Point;
|
|
|
|
|
2021-05-15 06:20:42 -05:00
|
|
|
#[rustc_clean(cfg="cfail2")]
|
2016-11-17 14:16:44 -06:00
|
|
|
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
|
2017-10-27 11:57:15 -05:00
|
|
|
pub mod fn_make_struct {
|
2016-11-17 14:16:44 -06:00
|
|
|
use point::Point;
|
|
|
|
|
2021-05-15 06:20:42 -05:00
|
|
|
#[rustc_clean(cfg="cfail2")]
|
2016-11-17 14:16:44 -06:00
|
|
|
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
|
2017-10-27 11:57:15 -05:00
|
|
|
pub mod fn_read_field {
|
2016-11-17 14:16:44 -06:00
|
|
|
use point::Point;
|
|
|
|
|
2021-05-15 06:20:42 -05:00
|
|
|
#[rustc_clean(cfg="cfail2")]
|
2016-11-17 14:16:44 -06:00
|
|
|
pub fn get_x(p: Point) -> f32 {
|
|
|
|
p.x
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A fn item that writes to a field of `Point` but does not invoke methods
|
2017-10-27 11:57:15 -05:00
|
|
|
pub mod fn_write_field {
|
2016-11-17 14:16:44 -06:00
|
|
|
use point::Point;
|
|
|
|
|
2021-05-15 06:20:42 -05:00
|
|
|
#[rustc_clean(cfg="cfail2")]
|
2016-11-17 14:16:44 -06:00
|
|
|
pub fn inc_x(p: &mut Point) {
|
|
|
|
p.x += 1.0;
|
|
|
|
}
|
|
|
|
}
|