Skip to content

Commit 86b3f6c

Browse files
committed
add a test case for changing a private impl method across crates
Currently doesn't work that well at all in terms of getting reuse afterwards, see rust-lang#37333. =)
1 parent 3200553 commit 86b3f6c

File tree

2 files changed

+124
-0
lines changed

2 files changed

+124
-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+
impl Point {
17+
fn distance_squared(&self) -> f32 {
18+
#[cfg(rpass1)]
19+
return self.x + self.y;
20+
21+
#[cfg(rpass2)]
22+
return self.x * self.x + self.y * self.y;
23+
}
24+
25+
pub fn distance_from_origin(&self) -> f32 {
26+
self.distance_squared().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,89 @@
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+
// FIXME(#37333) -- the following modules *should* be reused but are not
23+
#![rustc_partition_translated(module="struct_point-fn_calls_methods_in_same_impl", cfg="rpass2")]
24+
#![rustc_partition_translated(module="struct_point-fn_calls_methods_in_another_impl", cfg="rpass2")]
25+
#![rustc_partition_translated(module="struct_point-fn_make_struct", cfg="rpass2")]
26+
#![rustc_partition_translated(module="struct_point-fn_read_field", cfg="rpass2")]
27+
#![rustc_partition_translated(module="struct_point-fn_write_field", cfg="rpass2")]
28+
29+
extern crate point;
30+
31+
/// A fn item that calls (public) methods on `Point` from the same impl which changed
32+
mod fn_calls_methods_in_same_impl {
33+
use point::Point;
34+
35+
// FIXME(#37333) -- we should not need to typeck this again
36+
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
37+
pub fn check() {
38+
let x = Point { x: 2.0, y: 2.0 };
39+
x.distance_from_origin();
40+
}
41+
}
42+
43+
/// A fn item that calls (public) methods on `Point` from another impl
44+
mod fn_calls_methods_in_another_impl {
45+
use point::Point;
46+
47+
// FIXME(#37333) -- we should not need to typeck this again
48+
#[rustc_dirty(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+
// FIXME(#37333) -- we should not need to typeck this again
60+
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
61+
pub fn make_origin() -> Point {
62+
Point { x: 2.0, y: 2.0 }
63+
}
64+
}
65+
66+
/// A fn item that reads fields from `Point` but does not invoke methods
67+
mod fn_read_field {
68+
use point::Point;
69+
70+
// FIXME(#37333) -- we should not need to typeck this again
71+
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
72+
pub fn get_x(p: Point) -> f32 {
73+
p.x
74+
}
75+
}
76+
77+
/// A fn item that writes to a field of `Point` but does not invoke methods
78+
mod fn_write_field {
79+
use point::Point;
80+
81+
// FIXME(#37333) -- we should not need to typeck this again
82+
#[rustc_dirty(label="TypeckItemBody", cfg="rpass2")]
83+
pub fn inc_x(p: &mut Point) {
84+
p.x += 1.0;
85+
}
86+
}
87+
88+
fn main() {
89+
}

0 commit comments

Comments
 (0)