@@ -863,7 +863,7 @@ mod snapshot {
863
863
insta:: assert_snapshot!(
864
864
ctx. config( "build" )
865
865
. path( "opt-dist" )
866
- . render_steps( ) , @"[build] rustc 0 <host> -> OptimizedDist <host>" ) ;
866
+ . render_steps( ) , @"[build] rustc 0 <host> -> OptimizedDist 1 <host>" ) ;
867
867
}
868
868
869
869
#[ test]
@@ -880,7 +880,7 @@ mod snapshot {
880
880
ctx. config( "build" )
881
881
. path( "opt-dist" )
882
882
. stage( 1 )
883
- . render_steps( ) , @"[build] rustc 0 <host> -> OptimizedDist <host>" ) ;
883
+ . render_steps( ) , @"[build] rustc 0 <host> -> OptimizedDist 1 <host>" ) ;
884
884
}
885
885
886
886
#[ test]
@@ -890,7 +890,7 @@ mod snapshot {
890
890
ctx. config( "build" )
891
891
. path( "opt-dist" )
892
892
. stage( 2 )
893
- . render_steps( ) , @"[build] rustc 0 <host> -> OptimizedDist <host>" ) ;
893
+ . render_steps( ) , @"[build] rustc 0 <host> -> OptimizedDist 1 <host>" ) ;
894
894
}
895
895
896
896
#[ test]
@@ -984,23 +984,23 @@ mod snapshot {
984
984
ctx
985
985
. config( "dist" )
986
986
. render_steps( ) , @r"
987
- [build] rustc 0 <host> -> UnstableBookGen <host>
988
- [build] rustc 0 <host> -> Rustbook <host>
987
+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
988
+ [build] rustc 0 <host> -> Rustbook 1 <host>
989
989
[build] llvm <host>
990
990
[build] rustc 0 <host> -> rustc 1 <host>
991
991
[build] rustc 1 <host> -> std 1 <host>
992
992
[build] rustc 1 <host> -> rustc 2 <host>
993
993
[build] rustdoc 1 <host>
994
994
[doc] std 2 <host>
995
995
[build] rustc 2 <host> -> std 2 <host>
996
- [build] rustc 0 <host> -> LintDocs <host>
997
- [build] rustc 0 <host> -> RustInstaller <host>
996
+ [build] rustc 0 <host> -> LintDocs 1 <host>
997
+ [build] rustc 0 <host> -> RustInstaller 1 <host>
998
998
[dist] docs <host>
999
999
[doc] std 2 <host>
1000
1000
[dist] mingw <host>
1001
- [build] rustc 0 <host> -> GenerateCopyright <host>
1001
+ [build] rustc 0 <host> -> GenerateCopyright 1 <host>
1002
1002
[dist] rustc <host>
1003
- [dist] rustc 1 <host> -> std <host>
1003
+ [dist] rustc 1 <host> -> std 1 <host>
1004
1004
[dist] src <>
1005
1005
"
1006
1006
) ;
@@ -1014,25 +1014,25 @@ mod snapshot {
1014
1014
. config( "dist" )
1015
1015
. args( & [ "--set" , "build.extended=true" ] )
1016
1016
. render_steps( ) , @r"
1017
- [build] rustc 0 <host> -> UnstableBookGen <host>
1018
- [build] rustc 0 <host> -> Rustbook <host>
1017
+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
1018
+ [build] rustc 0 <host> -> Rustbook 1 <host>
1019
1019
[build] llvm <host>
1020
1020
[build] rustc 0 <host> -> rustc 1 <host>
1021
- [build] rustc 0 <host> -> WasmComponentLd <host>
1021
+ [build] rustc 0 <host> -> WasmComponentLd 1 <host>
1022
1022
[build] rustc 1 <host> -> std 1 <host>
1023
1023
[build] rustc 1 <host> -> rustc 2 <host>
1024
- [build] rustc 1 <host> -> WasmComponentLd <host>
1024
+ [build] rustc 1 <host> -> WasmComponentLd 2 <host>
1025
1025
[build] rustdoc 1 <host>
1026
1026
[doc] std 2 <host>
1027
1027
[build] rustc 2 <host> -> std 2 <host>
1028
- [build] rustc 0 <host> -> LintDocs <host>
1029
- [build] rustc 0 <host> -> RustInstaller <host>
1028
+ [build] rustc 0 <host> -> LintDocs 1 <host>
1029
+ [build] rustc 0 <host> -> RustInstaller 1 <host>
1030
1030
[dist] docs <host>
1031
1031
[doc] std 2 <host>
1032
1032
[dist] mingw <host>
1033
- [build] rustc 0 <host> -> GenerateCopyright <host>
1033
+ [build] rustc 0 <host> -> GenerateCopyright 1 <host>
1034
1034
[dist] rustc <host>
1035
- [dist] rustc 1 <host> -> std <host>
1035
+ [dist] rustc 1 <host> -> std 1 <host>
1036
1036
[dist] src <>
1037
1037
[build] rustc 0 <host> -> rustfmt 1 <host>
1038
1038
[build] rustc 0 <host> -> cargo-fmt 1 <host>
@@ -1052,8 +1052,8 @@ mod snapshot {
1052
1052
. hosts( & [ & host_target( ) ] )
1053
1053
. targets( & [ & host_target( ) , TEST_TRIPLE_1 ] )
1054
1054
. render_steps( ) , @r"
1055
- [build] rustc 0 <host> -> UnstableBookGen <host>
1056
- [build] rustc 0 <host> -> Rustbook <host>
1055
+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
1056
+ [build] rustc 0 <host> -> Rustbook 1 <host>
1057
1057
[build] llvm <host>
1058
1058
[build] rustc 0 <host> -> rustc 1 <host>
1059
1059
[build] rustc 1 <host> -> std 1 <host>
@@ -1062,19 +1062,19 @@ mod snapshot {
1062
1062
[doc] std 2 <host>
1063
1063
[doc] std 2 <target1>
1064
1064
[build] rustc 2 <host> -> std 2 <host>
1065
- [build] rustc 0 <host> -> LintDocs <host>
1066
- [build] rustc 0 <host> -> RustInstaller <host>
1065
+ [build] rustc 0 <host> -> LintDocs 1 <host>
1066
+ [build] rustc 0 <host> -> RustInstaller 1 <host>
1067
1067
[dist] docs <host>
1068
1068
[dist] docs <target1>
1069
1069
[doc] std 2 <host>
1070
1070
[doc] std 2 <target1>
1071
1071
[dist] mingw <host>
1072
1072
[dist] mingw <target1>
1073
- [build] rustc 0 <host> -> GenerateCopyright <host>
1073
+ [build] rustc 0 <host> -> GenerateCopyright 1 <host>
1074
1074
[dist] rustc <host>
1075
- [dist] rustc 1 <host> -> std <host>
1075
+ [dist] rustc 1 <host> -> std 1 <host>
1076
1076
[build] rustc 2 <host> -> std 2 <target1>
1077
- [dist] rustc 2 <host> -> std <target1>
1077
+ [dist] rustc 2 <host> -> std 2 <target1>
1078
1078
[dist] src <>
1079
1079
"
1080
1080
) ;
@@ -1089,29 +1089,29 @@ mod snapshot {
1089
1089
. hosts( & [ & host_target( ) , TEST_TRIPLE_1 ] )
1090
1090
. targets( & [ & host_target( ) ] )
1091
1091
. render_steps( ) , @r"
1092
- [build] rustc 0 <host> -> UnstableBookGen <host>
1093
- [build] rustc 0 <host> -> Rustbook <host>
1092
+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
1093
+ [build] rustc 0 <host> -> Rustbook 1 <host>
1094
1094
[build] llvm <host>
1095
1095
[build] rustc 0 <host> -> rustc 1 <host>
1096
1096
[build] rustc 1 <host> -> std 1 <host>
1097
1097
[build] rustc 1 <host> -> rustc 2 <host>
1098
1098
[build] rustdoc 1 <host>
1099
1099
[doc] std 2 <host>
1100
1100
[build] rustc 2 <host> -> std 2 <host>
1101
- [build] rustc 0 <host> -> LintDocs <host>
1101
+ [build] rustc 0 <host> -> LintDocs 1 <host>
1102
1102
[build] rustc 1 <host> -> std 1 <target1>
1103
1103
[build] rustc 2 <host> -> std 2 <target1>
1104
- [build] rustc 0 <host> -> RustInstaller <host>
1104
+ [build] rustc 0 <host> -> RustInstaller 1 <host>
1105
1105
[dist] docs <host>
1106
1106
[doc] std 2 <host>
1107
1107
[dist] mingw <host>
1108
- [build] rustc 0 <host> -> GenerateCopyright <host>
1108
+ [build] rustc 0 <host> -> GenerateCopyright 1 <host>
1109
1109
[dist] rustc <host>
1110
1110
[build] llvm <target1>
1111
1111
[build] rustc 1 <host> -> rustc 2 <target1>
1112
1112
[build] rustdoc 1 <target1>
1113
1113
[dist] rustc <target1>
1114
- [dist] rustc 1 <host> -> std <host>
1114
+ [dist] rustc 1 <host> -> std 1 <host>
1115
1115
[dist] src <>
1116
1116
"
1117
1117
) ;
@@ -1126,8 +1126,8 @@ mod snapshot {
1126
1126
. hosts( & [ & host_target( ) , TEST_TRIPLE_1 ] )
1127
1127
. targets( & [ & host_target( ) , TEST_TRIPLE_1 ] )
1128
1128
. render_steps( ) , @r"
1129
- [build] rustc 0 <host> -> UnstableBookGen <host>
1130
- [build] rustc 0 <host> -> Rustbook <host>
1129
+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
1130
+ [build] rustc 0 <host> -> Rustbook 1 <host>
1131
1131
[build] llvm <host>
1132
1132
[build] rustc 0 <host> -> rustc 1 <host>
1133
1133
[build] rustc 1 <host> -> std 1 <host>
@@ -1136,24 +1136,24 @@ mod snapshot {
1136
1136
[doc] std 2 <host>
1137
1137
[doc] std 2 <target1>
1138
1138
[build] rustc 2 <host> -> std 2 <host>
1139
- [build] rustc 0 <host> -> LintDocs <host>
1139
+ [build] rustc 0 <host> -> LintDocs 1 <host>
1140
1140
[build] rustc 1 <host> -> std 1 <target1>
1141
1141
[build] rustc 2 <host> -> std 2 <target1>
1142
- [build] rustc 0 <host> -> RustInstaller <host>
1142
+ [build] rustc 0 <host> -> RustInstaller 1 <host>
1143
1143
[dist] docs <host>
1144
1144
[dist] docs <target1>
1145
1145
[doc] std 2 <host>
1146
1146
[doc] std 2 <target1>
1147
1147
[dist] mingw <host>
1148
1148
[dist] mingw <target1>
1149
- [build] rustc 0 <host> -> GenerateCopyright <host>
1149
+ [build] rustc 0 <host> -> GenerateCopyright 1 <host>
1150
1150
[dist] rustc <host>
1151
1151
[build] llvm <target1>
1152
1152
[build] rustc 1 <host> -> rustc 2 <target1>
1153
1153
[build] rustdoc 1 <target1>
1154
1154
[dist] rustc <target1>
1155
- [dist] rustc 1 <host> -> std <host>
1156
- [dist] rustc 1 <host> -> std <target1>
1155
+ [dist] rustc 1 <host> -> std 1 <host>
1156
+ [dist] rustc 1 <host> -> std 1 <target1>
1157
1157
[dist] src <>
1158
1158
"
1159
1159
) ;
@@ -1168,21 +1168,21 @@ mod snapshot {
1168
1168
. hosts( & [ ] )
1169
1169
. targets( & [ TEST_TRIPLE_1 ] )
1170
1170
. render_steps( ) , @r"
1171
- [build] rustc 0 <host> -> UnstableBookGen <host>
1172
- [build] rustc 0 <host> -> Rustbook <host>
1171
+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
1172
+ [build] rustc 0 <host> -> Rustbook 1 <host>
1173
1173
[build] llvm <host>
1174
1174
[build] rustc 0 <host> -> rustc 1 <host>
1175
1175
[build] rustc 1 <host> -> std 1 <host>
1176
1176
[build] rustc 1 <host> -> rustc 2 <host>
1177
1177
[build] rustdoc 1 <host>
1178
1178
[doc] std 2 <target1>
1179
1179
[build] rustc 2 <host> -> std 2 <host>
1180
- [build] rustc 0 <host> -> RustInstaller <host>
1180
+ [build] rustc 0 <host> -> RustInstaller 1 <host>
1181
1181
[dist] docs <target1>
1182
1182
[doc] std 2 <target1>
1183
1183
[dist] mingw <target1>
1184
1184
[build] rustc 2 <host> -> std 2 <target1>
1185
- [dist] rustc 2 <host> -> std <target1>
1185
+ [dist] rustc 2 <host> -> std 2 <target1>
1186
1186
" ) ;
1187
1187
}
1188
1188
@@ -1198,31 +1198,31 @@ mod snapshot {
1198
1198
. targets( & [ TEST_TRIPLE_1 ] )
1199
1199
. args( & [ "--set" , "rust.channel=nightly" , "--set" , "build.extended=true" ] )
1200
1200
. render_steps( ) , @r"
1201
- [build] rustc 0 <host> -> UnstableBookGen <host>
1202
- [build] rustc 0 <host> -> Rustbook <host>
1201
+ [build] rustc 0 <host> -> UnstableBookGen 1 <host>
1202
+ [build] rustc 0 <host> -> Rustbook 1 <host>
1203
1203
[build] llvm <host>
1204
1204
[build] rustc 0 <host> -> rustc 1 <host>
1205
- [build] rustc 0 <host> -> WasmComponentLd <host>
1205
+ [build] rustc 0 <host> -> WasmComponentLd 1 <host>
1206
1206
[build] rustc 1 <host> -> std 1 <host>
1207
1207
[build] rustc 1 <host> -> rustc 2 <host>
1208
- [build] rustc 1 <host> -> WasmComponentLd <host>
1208
+ [build] rustc 1 <host> -> WasmComponentLd 2 <host>
1209
1209
[build] rustdoc 1 <host>
1210
1210
[doc] std 2 <target1>
1211
1211
[build] rustc 2 <host> -> std 2 <host>
1212
1212
[build] rustc 1 <host> -> std 1 <target1>
1213
1213
[build] rustc 2 <host> -> std 2 <target1>
1214
- [build] rustc 0 <host> -> LintDocs <host>
1215
- [build] rustc 0 <host> -> RustInstaller <host>
1214
+ [build] rustc 0 <host> -> LintDocs 1 <host>
1215
+ [build] rustc 0 <host> -> RustInstaller 1 <host>
1216
1216
[dist] docs <target1>
1217
1217
[doc] std 2 <target1>
1218
1218
[dist] mingw <target1>
1219
1219
[build] llvm <target1>
1220
1220
[build] rustc 1 <host> -> rustc 2 <target1>
1221
- [build] rustc 1 <host> -> WasmComponentLd <target1>
1221
+ [build] rustc 1 <host> -> WasmComponentLd 2 <target1>
1222
1222
[build] rustdoc 1 <target1>
1223
- [build] rustc 0 <host> -> GenerateCopyright <host>
1223
+ [build] rustc 0 <host> -> GenerateCopyright 1 <host>
1224
1224
[dist] rustc <target1>
1225
- [dist] rustc 1 <host> -> std <target1>
1225
+ [dist] rustc 1 <host> -> std 1 <target1>
1226
1226
[dist] src <>
1227
1227
[build] rustc 0 <host> -> rustfmt 1 <target1>
1228
1228
[build] rustc 0 <host> -> cargo-fmt 1 <target1>
@@ -1384,7 +1384,8 @@ fn render_metadata(metadata: &StepMetadata) -> String {
1384
1384
if let Some ( compiler) = metadata. built_by {
1385
1385
write ! ( record, "{} -> " , render_compiler( compiler) ) ;
1386
1386
}
1387
- let stage = if let Some ( stage) = metadata. stage { format ! ( "{stage} " ) } else { "" . to_string ( ) } ;
1387
+ let stage =
1388
+ if let Some ( stage) = metadata. get_stage ( ) { format ! ( "{stage} " ) } else { "" . to_string ( ) } ;
1388
1389
write ! ( record, "{} {stage}<{}>" , metadata. name, normalize_target( metadata. target) ) ;
1389
1390
record
1390
1391
}
0 commit comments