-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
2 changed files
with
119 additions
and
0 deletions.
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
pub struct Point { | ||
pub x: f32, | ||
pub y: f32, | ||
} | ||
|
||
#[cfg(rpass2)] | ||
fn unused_helper() { | ||
} | ||
|
||
fn distance_squared(this: &Point) -> f32 { | ||
return this.x * this.x + this.y * this.y; | ||
} | ||
|
||
impl Point { | ||
pub fn distance_from_origin(&self) -> f32 { | ||
distance_squared(self).sqrt() | ||
} | ||
} | ||
|
||
impl Point { | ||
pub fn translate(&mut self, x: f32, y: f32) { | ||
self.x += x; | ||
self.y += y; | ||
} | ||
} |
84 changes: 84 additions & 0 deletions
84
src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
// Test where we add a private item into the root of an external. | ||
// crate. This should not cause anything we use to be invalidated. | ||
// Regression test for #36168. | ||
|
||
// revisions:rpass1 rpass2 | ||
// compile-flags: -Z query-dep-graph | ||
// aux-build:point.rs | ||
|
||
#![feature(rustc_attrs)] | ||
#![feature(stmt_expr_attributes)] | ||
#![allow(dead_code)] | ||
|
||
#![rustc_partition_reused(module="struct_point-fn_calls_methods_in_same_impl", cfg="rpass2")] | ||
#![rustc_partition_reused(module="struct_point-fn_calls_methods_in_another_impl", cfg="rpass2")] | ||
#![rustc_partition_reused(module="struct_point-fn_read_field", cfg="rpass2")] | ||
#![rustc_partition_reused(module="struct_point-fn_write_field", cfg="rpass2")] | ||
#![rustc_partition_reused(module="struct_point-fn_make_struct", cfg="rpass2")] | ||
|
||
extern crate point; | ||
|
||
/// A fn item that calls (public) methods on `Point` from the same impl which changed | ||
mod fn_calls_methods_in_same_impl { | ||
use point::Point; | ||
|
||
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")] | ||
pub fn check() { | ||
let x = Point { x: 2.0, y: 2.0 }; | ||
x.distance_from_origin(); | ||
} | ||
} | ||
|
||
/// A fn item that calls (public) methods on `Point` from another impl | ||
mod fn_calls_methods_in_another_impl { | ||
use point::Point; | ||
|
||
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")] | ||
pub fn check() { | ||
let mut x = Point { x: 2.0, y: 2.0 }; | ||
x.translate(3.0, 3.0); | ||
} | ||
} | ||
|
||
/// A fn item that makes an instance of `Point` but does not invoke methods | ||
mod fn_make_struct { | ||
use point::Point; | ||
|
||
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")] | ||
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 | ||
mod fn_read_field { | ||
use point::Point; | ||
|
||
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")] | ||
pub fn get_x(p: Point) -> f32 { | ||
p.x | ||
} | ||
} | ||
|
||
/// A fn item that writes to a field of `Point` but does not invoke methods | ||
mod fn_write_field { | ||
use point::Point; | ||
|
||
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")] | ||
pub fn inc_x(p: &mut Point) { | ||
p.x += 1.0; | ||
} | ||
} | ||
|
||
fn main() { | ||
} |