-
Notifications
You must be signed in to change notification settings - Fork 13.5k
add regression test for #36168 #37919
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
add regression test for #36168
Fixes #36168
- Loading branch information
commit dac987e355deb903493d22c0ae8a8a4fd072d1c5
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 hidden or 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 hidden or 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() { | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since no impl is changed in this test case, really, I think one impl would be enough.