Auto merge of #137476 - onur-ozkan:137469, r=jieyouxu · rust-lang/rust@f8a913b (original) (raw)

`@@ -421,11 +421,7 @@ impl Step for Rustc {

`

421

421

``

422

422

`if let Some(ra_proc_macro_srv) = builder.ensure_if_default(

`

423

423

` tool::RustAnalyzerProcMacroSrv {

`

424

``

`-

compiler: builder.compiler_for(

`

425

``

`-

compiler.stage,

`

426

``

`-

builder.config.build,

`

427

``

`-

compiler.host,

`

428

``

`-

),

`

``

424

`+

compiler: builder.compiler(compiler.stage, builder.config.build),

`

429

425

`target: compiler.host,

`

430

426

`},

`

431

427

` builder.kind,

`

`@@ -775,11 +771,7 @@ impl Step for Analysis {

`

775

771

`// Find the actual compiler (handling the full bootstrap option) which

`

776

772

`// produced the save-analysis data because that data isn't copied

`

777

773

`// through the sysroot uplifting.

`

778

``

`-

compiler: run.builder.compiler_for(

`

779

``

`-

run.builder.top_stage,

`

780

``

`-

run.builder.config.build,

`

781

``

`-

run.target,

`

782

``

`-

),

`

``

774

`+

compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),

`

783

775

`target: run.target,

`

784

776

`});

`

785

777

`}

`

`@@ -1124,11 +1116,7 @@ impl Step for Cargo {

`

1124

1116

``

1125

1117

`fn make_run(run: RunConfig<'_>) {

`

1126

1118

` run.builder.ensure(Cargo {

`

1127

``

`-

compiler: run.builder.compiler_for(

`

1128

``

`-

run.builder.top_stage,

`

1129

``

`-

run.builder.config.build,

`

1130

``

`-

run.target,

`

1131

``

`-

),

`

``

1119

`+

compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),

`

1132

1120

`target: run.target,

`

1133

1121

`});

`

1134

1122

`}

`

`@@ -1173,11 +1161,7 @@ impl Step for Rls {

`

1173

1161

``

1174

1162

`fn make_run(run: RunConfig<'_>) {

`

1175

1163

` run.builder.ensure(Rls {

`

1176

``

`-

compiler: run.builder.compiler_for(

`

1177

``

`-

run.builder.top_stage,

`

1178

``

`-

run.builder.config.build,

`

1179

``

`-

run.target,

`

1180

``

`-

),

`

``

1164

`+

compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),

`

1181

1165

`target: run.target,

`

1182

1166

`});

`

1183

1167

`}

`

`@@ -1215,11 +1199,7 @@ impl Step for RustAnalyzer {

`

1215

1199

``

1216

1200

`fn make_run(run: RunConfig<'_>) {

`

1217

1201

` run.builder.ensure(RustAnalyzer {

`

1218

``

`-

compiler: run.builder.compiler_for(

`

1219

``

`-

run.builder.top_stage,

`

1220

``

`-

run.builder.config.build,

`

1221

``

`-

run.target,

`

1222

``

`-

),

`

``

1202

`+

compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),

`

1223

1203

`target: run.target,

`

1224

1204

`});

`

1225

1205

`}

`

`@@ -1257,11 +1237,7 @@ impl Step for Clippy {

`

1257

1237

``

1258

1238

`fn make_run(run: RunConfig<'_>) {

`

1259

1239

` run.builder.ensure(Clippy {

`

1260

``

`-

compiler: run.builder.compiler_for(

`

1261

``

`-

run.builder.top_stage,

`

1262

``

`-

run.builder.config.build,

`

1263

``

`-

run.target,

`

1264

``

`-

),

`

``

1240

`+

compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),

`

1265

1241

`target: run.target,

`

1266

1242

`});

`

1267

1243

`}

`

`@@ -1304,11 +1280,7 @@ impl Step for Miri {

`

1304

1280

``

1305

1281

`fn make_run(run: RunConfig<'_>) {

`

1306

1282

` run.builder.ensure(Miri {

`

1307

``

`-

compiler: run.builder.compiler_for(

`

1308

``

`-

run.builder.top_stage,

`

1309

``

`-

run.builder.config.build,

`

1310

``

`-

run.target,

`

1311

``

`-

),

`

``

1283

`+

compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),

`

1312

1284

`target: run.target,

`

1313

1285

`});

`

1314

1286

`}

`

`@@ -1442,11 +1414,7 @@ impl Step for Rustfmt {

`

1442

1414

``

1443

1415

`fn make_run(run: RunConfig<'_>) {

`

1444

1416

` run.builder.ensure(Rustfmt {

`

1445

``

`-

compiler: run.builder.compiler_for(

`

1446

``

`-

run.builder.top_stage,

`

1447

``

`-

run.builder.config.build,

`

1448

``

`-

run.target,

`

1449

``

`-

),

`

``

1417

`+

compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),

`

1450

1418

`target: run.target,

`

1451

1419

`});

`

1452

1420

`}

`

`@@ -1496,7 +1464,7 @@ impl Step for Extended {

`

1496

1464

`fn run(self, builder: &Builder<'_>) {

`

1497

1465

`let target = self.target;

`

1498

1466

`let stage = self.stage;

`

1499

``

`-

let compiler = builder.compiler_for(self.stage, self.host, self.target);

`

``

1467

`+

let compiler = builder.compiler(self.stage, self.host);

`

1500

1468

``

1501

1469

` builder.info(&format!("Dist extended stage{} ({})", compiler.stage, target));

`

1502

1470

``

`@@ -2260,11 +2228,7 @@ impl Step for LlvmBitcodeLinker {

`

2260

2228

``

2261

2229

`fn make_run(run: RunConfig<'_>) {

`

2262

2230

` run.builder.ensure(LlvmBitcodeLinker {

`

2263

``

`-

compiler: run.builder.compiler_for(

`

2264

``

`-

run.builder.top_stage,

`

2265

``

`-

run.builder.config.build,

`

2266

``

`-

run.target,

`

2267

``

`-

),

`

``

2231

`+

compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),

`

2268

2232

`target: run.target,

`

2269

2233

`});

`

2270

2234

`}

`