File tree 4 files changed +25
-23
lines changed
compiler/rustc_passes/src
4 files changed +25
-23
lines changed Original file line number Diff line number Diff line change @@ -122,7 +122,9 @@ impl<'k> StatCollector<'k> {
122
122
// We will soon sort, so the initial order does not matter.
123
123
#[ allow( rustc:: potential_query_instability) ]
124
124
let mut nodes: Vec < _ > = self . nodes . iter ( ) . collect ( ) ;
125
- nodes. sort_by_key ( |( _, node) | node. stats . count * node. stats . size ) ;
125
+ nodes. sort_by_cached_key ( |( label, node) | {
126
+ ( node. stats . count * node. stats . size , label. to_owned ( ) )
127
+ } ) ;
126
128
127
129
let total_size = nodes. iter ( ) . map ( |( _, node) | node. stats . count * node. stats . size ) . sum ( ) ;
128
130
Original file line number Diff line number Diff line change @@ -10,17 +10,17 @@ note: the lint level is defined here
10
10
LL | #![deny(unused_macro_rules)]
11
11
| ^^^^^^^^^^^^^^^^^^
12
12
13
- error: rule #3 of macro `num2` is never used
14
- --> $DIR/unused-macro-rules-compile-error.rs:22:5
15
- |
16
- LL | (two_) => { compile_error! };
17
- | ^^^^^^
18
-
19
13
error: rule #2 of macro `num2` is never used
20
14
--> $DIR/unused-macro-rules-compile-error.rs:20:5
21
15
|
22
16
LL | (two) => { fn compile_error() {} };
23
17
| ^^^^^
24
18
19
+ error: rule #3 of macro `num2` is never used
20
+ --> $DIR/unused-macro-rules-compile-error.rs:22:5
21
+ |
22
+ LL | (two_) => { compile_error! };
23
+ | ^^^^^^
24
+
25
25
error: aborting due to 3 previous errors
26
26
Original file line number Diff line number Diff line change 1
- error: rule #4 of macro `num` is never used
2
- --> $DIR/unused-macro-rules-decl.rs:11 :5
1
+ error: rule #2 of macro `num` is never used
2
+ --> $DIR/unused-macro-rules-decl.rs:9 :5
3
3
|
4
- LL | (four ) => { 4 },
5
- | ^^^^^^
4
+ LL | (two ) => { 2 },
5
+ | ^^^^^
6
6
|
7
7
note: the lint level is defined here
8
8
--> $DIR/unused-macro-rules-decl.rs:2:9
9
9
|
10
10
LL | #![deny(unused_macro_rules)]
11
11
| ^^^^^^^^^^^^^^^^^^
12
12
13
- error: rule #2 of macro `num` is never used
14
- --> $DIR/unused-macro-rules-decl.rs:9 :5
13
+ error: rule #4 of macro `num` is never used
14
+ --> $DIR/unused-macro-rules-decl.rs:11 :5
15
15
|
16
- LL | (two ) => { 2 },
17
- | ^^^^^
16
+ LL | (four ) => { 4 },
17
+ | ^^^^^^
18
18
19
19
error: rule #3 of macro `num_rec` is never used
20
20
--> $DIR/unused-macro-rules-decl.rs:31:5
Original file line number Diff line number Diff line change 1
- error: rule #4 of macro `num` is never used
2
- --> $DIR/unused-macro-rules.rs:10 :5
1
+ error: rule #2 of macro `num` is never used
2
+ --> $DIR/unused-macro-rules.rs:8 :5
3
3
|
4
- LL | (four ) => { 4 };
5
- | ^^^^^^
4
+ LL | (two ) => { 2 };
5
+ | ^^^^^
6
6
|
7
7
note: the lint level is defined here
8
8
--> $DIR/unused-macro-rules.rs:1:9
9
9
|
10
10
LL | #![deny(unused_macro_rules)]
11
11
| ^^^^^^^^^^^^^^^^^^
12
12
13
- error: rule #2 of macro `num` is never used
14
- --> $DIR/unused-macro-rules.rs:8 :5
13
+ error: rule #4 of macro `num` is never used
14
+ --> $DIR/unused-macro-rules.rs:10 :5
15
15
|
16
- LL | (two ) => { 2 };
17
- | ^^^^^
16
+ LL | (four ) => { 4 };
17
+ | ^^^^^^
18
18
19
19
error: rule #3 of macro `num_rec` is never used
20
20
--> $DIR/unused-macro-rules.rs:30:5
You can’t perform that action at this time.
0 commit comments