Skip to content

Commit 4558068

Browse files
ZoxcZoxc
committed
Update tests
1 parent 0128844 commit 4558068

File tree

53 files changed

+295
-295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+295
-295
lines changed

‎src/librustc_incremental/persist/dirty_clean.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
//! we will compare the fingerprint from the current and from the previous
44
//! compilation session as appropriate:
55
//!
6-
//! - `#[rustc_clean(cfg="rev2", except="TypeckTables")]` if we are
6+
//! - `#[rustc_clean(cfg="rev2", except="typeck_tables_of")]` if we are
77
//! in `#[cfg(rev2)]`, then the fingerprints associated with
8-
//! `DepNode::TypeckTables(X)` must be DIFFERENT (`X` is the `DefId` of the
8+
//! `DepNode::typeck_tables_of(X)` must be DIFFERENT (`X` is the `DefId` of the
99
//! current node).
1010
//! - `#[rustc_clean(cfg="rev2")]` same as above, except that the
1111
//! fingerprints must be the SAME (along with all other fingerprints).

‎src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extern crate point;
2424
pub mod fn_calls_methods_in_same_impl {
2525
use point::Point;
2626

27-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
27+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
2828
pub fn check() {
2929
let x = Point { x: 2.0, y: 2.0 };
3030
x.distance_from_origin();
@@ -35,7 +35,7 @@ pub mod fn_calls_methods_in_same_impl {
3535
pub mod fn_calls_free_fn {
3636
use point::{self, Point};
3737

38-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
38+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
3939
pub fn check() {
4040
let x = Point { x: 2.0, y: 2.0 };
4141
point::distance_squared(&x);
@@ -46,7 +46,7 @@ pub mod fn_calls_free_fn {
4646
pub mod fn_make_struct {
4747
use point::Point;
4848

49-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
49+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
5050
pub fn make_origin() -> Point {
5151
Point { x: 2.0, y: 2.0 }
5252
}
@@ -56,7 +56,7 @@ pub mod fn_make_struct {
5656
pub mod fn_read_field {
5757
use point::Point;
5858

59-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
59+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
6060
pub fn get_x(p: Point) -> f32 {
6161
p.x
6262
}
@@ -66,7 +66,7 @@ pub mod fn_read_field {
6666
pub mod fn_write_field {
6767
use point::Point;
6868

69-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
69+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
7070
pub fn inc_x(p: &mut Point) {
7171
p.x += 1.0;
7272
}

‎src/test/incremental/callee_caller_cross_crate/b.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
extern crate a;
88

9-
#[rustc_dirty(label="TypeckTables", cfg="rpass2")]
9+
#[rustc_dirty(label="typeck_tables_of", cfg="rpass2")]
1010
pub fn call_function0() {
1111
a::function0(77);
1212
}
1313

14-
#[rustc_clean(label="TypeckTables", cfg="rpass2")]
14+
#[rustc_clean(label="typeck_tables_of", cfg="rpass2")]
1515
pub fn call_function1() {
1616
a::function1(77);
1717
}

‎src/test/incremental/change_add_field/struct_point.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub mod point {
7070
pub mod fn_with_type_in_sig {
7171
use point::Point;
7272

73-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
73+
#[rustc_dirty(label="typeck_tables_of", cfg="cfail2")]
7474
pub fn boop(p: Option<&Point>) -> f32 {
7575
p.map(|p| p.total()).unwrap_or(0.0)
7676
}
@@ -86,7 +86,7 @@ pub mod fn_with_type_in_sig {
8686
pub mod call_fn_with_type_in_sig {
8787
use fn_with_type_in_sig;
8888

89-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
89+
#[rustc_dirty(label="typeck_tables_of", cfg="cfail2")]
9090
pub fn bip() -> f32 {
9191
fn_with_type_in_sig::boop(None)
9292
}
@@ -102,7 +102,7 @@ pub mod call_fn_with_type_in_sig {
102102
pub mod fn_with_type_in_body {
103103
use point::Point;
104104

105-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
105+
#[rustc_dirty(label="typeck_tables_of", cfg="cfail2")]
106106
pub fn boop() -> f32 {
107107
Point::origin().total()
108108
}
@@ -115,7 +115,7 @@ pub mod fn_with_type_in_body {
115115
pub mod call_fn_with_type_in_body {
116116
use fn_with_type_in_body;
117117

118-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
118+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
119119
pub fn bip() -> f32 {
120120
fn_with_type_in_body::boop()
121121
}
@@ -125,7 +125,7 @@ pub mod call_fn_with_type_in_body {
125125
pub mod fn_make_struct {
126126
use point::Point;
127127

128-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
128+
#[rustc_dirty(label="typeck_tables_of", cfg="cfail2")]
129129
pub fn make_origin(p: Point) -> Point {
130130
Point { ..p }
131131
}
@@ -135,7 +135,7 @@ pub mod fn_make_struct {
135135
pub mod fn_read_field {
136136
use point::Point;
137137

138-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
138+
#[rustc_dirty(label="typeck_tables_of", cfg="cfail2")]
139139
pub fn get_x(p: Point) -> f32 {
140140
p.x
141141
}
@@ -145,7 +145,7 @@ pub mod fn_read_field {
145145
pub mod fn_write_field {
146146
use point::Point;
147147

148-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
148+
#[rustc_dirty(label="typeck_tables_of", cfg="cfail2")]
149149
pub fn inc_x(p: &mut Point) {
150150
p.x += 1.0;
151151
}

‎src/test/incremental/change_crate_order/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extern crate a;
1818
use a::A;
1919
use b::B;
2020

21-
//? #[rustc_clean(label="TypeckTables", cfg="rpass2")]
21+
//? #[rustc_clean(label="typeck_tables_of", cfg="rpass2")]
2222
pub fn main() {
2323
A + B;
2424
}

‎src/test/incremental/change_private_fn/struct_point.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub mod point {
5151
pub mod fn_calls_methods_in_same_impl {
5252
use point::Point;
5353

54-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
54+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
5555
pub fn check() {
5656
let x = Point { x: 2.0, y: 2.0 };
5757
x.distance_from_origin();
@@ -62,7 +62,7 @@ pub mod fn_calls_methods_in_same_impl {
6262
pub mod fn_calls_methods_in_another_impl {
6363
use point::Point;
6464

65-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
65+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
6666
pub fn check() {
6767
let mut x = Point { x: 2.0, y: 2.0 };
6868
x.translate(3.0, 3.0);
@@ -73,7 +73,7 @@ pub mod fn_calls_methods_in_another_impl {
7373
pub mod fn_make_struct {
7474
use point::Point;
7575

76-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
76+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
7777
pub fn make_origin() -> Point {
7878
Point { x: 2.0, y: 2.0 }
7979
}
@@ -83,7 +83,7 @@ pub mod fn_make_struct {
8383
pub mod fn_read_field {
8484
use point::Point;
8585

86-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
86+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
8787
pub fn get_x(p: Point) -> f32 {
8888
p.x
8989
}
@@ -93,7 +93,7 @@ pub mod fn_read_field {
9393
pub mod fn_write_field {
9494
use point::Point;
9595

96-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
96+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
9797
pub fn inc_x(p: &mut Point) {
9898
p.x += 1.0;
9999
}

‎src/test/incremental/change_private_fn_cc/struct_point.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extern crate point;
2323
pub mod fn_calls_methods_in_same_impl {
2424
use point::Point;
2525

26-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
26+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
2727
pub fn check() {
2828
let x = Point { x: 2.0, y: 2.0 };
2929
x.distance_from_origin();
@@ -34,7 +34,7 @@ pub mod fn_calls_methods_in_same_impl {
3434
pub mod fn_calls_methods_in_another_impl {
3535
use point::Point;
3636

37-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
37+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
3838
pub fn check() {
3939
let mut x = Point { x: 2.0, y: 2.0 };
4040
x.translate(3.0, 3.0);
@@ -45,7 +45,7 @@ pub mod fn_calls_methods_in_another_impl {
4545
pub mod fn_make_struct {
4646
use point::Point;
4747

48-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
48+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
4949
pub fn make_origin() -> Point {
5050
Point { x: 2.0, y: 2.0 }
5151
}
@@ -55,7 +55,7 @@ pub mod fn_make_struct {
5555
pub mod fn_read_field {
5656
use point::Point;
5757

58-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
58+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
5959
pub fn get_x(p: Point) -> f32 {
6060
p.x
6161
}
@@ -65,7 +65,7 @@ pub mod fn_read_field {
6565
pub mod fn_write_field {
6666
use point::Point;
6767

68-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
68+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
6969
pub fn inc_x(p: &mut Point) {
7070
p.x += 1.0;
7171
}

‎src/test/incremental/change_private_impl_method/struct_point.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub mod point {
5151
pub mod fn_calls_methods_in_same_impl {
5252
use point::Point;
5353

54-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
54+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
5555
pub fn check() {
5656
let x = Point { x: 2.0, y: 2.0 };
5757
x.distance_from_origin();
@@ -62,7 +62,7 @@ pub mod fn_calls_methods_in_same_impl {
6262
pub mod fn_calls_methods_in_another_impl {
6363
use point::Point;
6464

65-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
65+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
6666
pub fn check() {
6767
let mut x = Point { x: 2.0, y: 2.0 };
6868
x.translate(3.0, 3.0);
@@ -73,7 +73,7 @@ pub mod fn_calls_methods_in_another_impl {
7373
pub mod fn_make_struct {
7474
use point::Point;
7575

76-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
76+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
7777
pub fn make_origin() -> Point {
7878
Point { x: 2.0, y: 2.0 }
7979
}
@@ -83,7 +83,7 @@ pub mod fn_make_struct {
8383
pub mod fn_read_field {
8484
use point::Point;
8585

86-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
86+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
8787
pub fn get_x(p: Point) -> f32 {
8888
p.x
8989
}
@@ -93,7 +93,7 @@ pub mod fn_read_field {
9393
pub mod fn_write_field {
9494
use point::Point;
9595

96-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
96+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
9797
pub fn inc_x(p: &mut Point) {
9898
p.x += 1.0;
9999
}

‎src/test/incremental/change_private_impl_method_cc/struct_point.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extern crate point;
2424
pub mod fn_calls_methods_in_same_impl {
2525
use point::Point;
2626

27-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
27+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
2828
pub fn check() {
2929
let x = Point { x: 2.0, y: 2.0 };
3030
x.distance_from_origin();
@@ -35,7 +35,7 @@ pub mod fn_calls_methods_in_same_impl {
3535
pub mod fn_calls_methods_in_another_impl {
3636
use point::Point;
3737

38-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
38+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
3939
pub fn dirty() {
4040
let mut x = Point { x: 2.0, y: 2.0 };
4141
x.translate(3.0, 3.0);
@@ -46,7 +46,7 @@ pub mod fn_calls_methods_in_another_impl {
4646
pub mod fn_make_struct {
4747
use point::Point;
4848

49-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
49+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
5050
pub fn make_origin() -> Point {
5151
Point { x: 2.0, y: 2.0 }
5252
}
@@ -56,7 +56,7 @@ pub mod fn_make_struct {
5656
pub mod fn_read_field {
5757
use point::Point;
5858

59-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
59+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
6060
pub fn get_x(p: Point) -> f32 {
6161
p.x
6262
}
@@ -66,7 +66,7 @@ pub mod fn_read_field {
6666
pub mod fn_write_field {
6767
use point::Point;
6868

69-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
69+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
7070
pub fn inc_x(p: &mut Point) {
7171
p.x += 1.0;
7272
}

‎src/test/incremental/change_pub_inherent_method_body/struct_point.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub mod point {
4242
pub mod fn_calls_changed_method {
4343
use point::Point;
4444

45-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
45+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
4646
pub fn check() {
4747
let p = Point { x: 2.0, y: 2.0 };
4848
p.distance_from_origin();
@@ -53,7 +53,7 @@ pub mod fn_calls_changed_method {
5353
pub mod fn_calls_another_method {
5454
use point::Point;
5555

56-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
56+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
5757
pub fn check() {
5858
let p = Point { x: 2.0, y: 2.0 };
5959
p.x();
@@ -64,7 +64,7 @@ pub mod fn_calls_another_method {
6464
pub mod fn_make_struct {
6565
use point::Point;
6666

67-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
67+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
6868
pub fn make_origin() -> Point {
6969
Point { x: 2.0, y: 2.0 }
7070
}
@@ -74,7 +74,7 @@ pub mod fn_make_struct {
7474
pub mod fn_read_field {
7575
use point::Point;
7676

77-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
77+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
7878
pub fn get_x(p: Point) -> f32 {
7979
p.x
8080
}
@@ -84,7 +84,7 @@ pub mod fn_read_field {
8484
pub mod fn_write_field {
8585
use point::Point;
8686

87-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
87+
#[rustc_clean(label="typeck_tables_of", cfg="cfail2")]
8888
pub fn inc_x(p: &mut Point) {
8989
p.x += 1.0;
9090
}

0 commit comments

Comments
 (0)