Skip to content

Commit 3dbf4d1

Browse files
committed
test case for changing a private fn in root of another crate
1 parent 86b3f6c commit 3dbf4d1

File tree

2 files changed

+121
-0
lines changed

2 files changed

+121
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
pub struct Point {
12+
pub x: f32,
13+
pub y: f32,
14+
}
15+
16+
fn distance_squared(this: &Point) -> f32 {
17+
#[cfg(rpass1)]
18+
return this.x + this.y;
19+
20+
#[cfg(rpass2)]
21+
return this.x * this.x + this.y * this.y;
22+
}
23+
24+
impl Point {
25+
pub fn distance_from_origin(&self) -> f32 {
26+
distance_squared(self).sqrt()
27+
}
28+
}
29+
30+
impl Point {
31+
pub fn translate(&mut self, x: f32, y: f32) {
32+
self.x += x;
33+
self.y += y;
34+
}
35+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Test where we change the body of a private method in an impl.
12+
// We then test what sort of functions must be rebuilt as a result.
13+
14+
// revisions:rpass1 rpass2
15+
// compile-flags: -Z query-dep-graph
16+
// aux-build:point.rs
17+
18+
#![feature(rustc_attrs)]
19+
#![feature(stmt_expr_attributes)]
20+
#![allow(dead_code)]
21+
22+
#![rustc_partition_reused(module="struct_point-fn_calls_methods_in_same_impl", cfg="rpass2")]
23+
#![rustc_partition_reused(module="struct_point-fn_calls_methods_in_another_impl", cfg="rpass2")]
24+
#![rustc_partition_reused(module="struct_point-fn_read_field", cfg="rpass2")]
25+
#![rustc_partition_reused(module="struct_point-fn_write_field", cfg="rpass2")]
26+
27+
// FIXME(#37335) -- should be reused, but an errant Krate edge causes
28+
// it to get translated (at least I *think* this is that same problem)
29+
#![rustc_partition_translated(module="struct_point-fn_make_struct", cfg="rpass2")]
30+
31+
extern crate point;
32+
33+
/// A fn item that calls (public) methods on `Point` from the same impl which changed
34+
mod fn_calls_methods_in_same_impl {
35+
use point::Point;
36+
37+
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
38+
pub fn check() {
39+
let x = Point { x: 2.0, y: 2.0 };
40+
x.distance_from_origin();
41+
}
42+
}
43+
44+
/// A fn item that calls (public) methods on `Point` from another impl
45+
mod fn_calls_methods_in_another_impl {
46+
use point::Point;
47+
48+
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
49+
pub fn check() {
50+
let mut x = Point { x: 2.0, y: 2.0 };
51+
x.translate(3.0, 3.0);
52+
}
53+
}
54+
55+
/// A fn item that makes an instance of `Point` but does not invoke methods
56+
mod fn_make_struct {
57+
use point::Point;
58+
59+
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
60+
pub fn make_origin() -> Point {
61+
Point { x: 2.0, y: 2.0 }
62+
}
63+
}
64+
65+
/// A fn item that reads fields from `Point` but does not invoke methods
66+
mod fn_read_field {
67+
use point::Point;
68+
69+
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
70+
pub fn get_x(p: Point) -> f32 {
71+
p.x
72+
}
73+
}
74+
75+
/// A fn item that writes to a field of `Point` but does not invoke methods
76+
mod fn_write_field {
77+
use point::Point;
78+
79+
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
80+
pub fn inc_x(p: &mut Point) {
81+
p.x += 1.0;
82+
}
83+
}
84+
85+
fn main() {
86+
}

0 commit comments

Comments
 (0)