Skip to content

prefer compile::stream_cargo for building tools#125781

Merged
bors merged 1 commit intorust-lang:masterfrom
onur-ozkan:improve-tool-builder
Jun 7, 2024
Merged

prefer compile::stream_cargo for building tools#125781
bors merged 1 commit intorust-lang:masterfrom
onur-ozkan:improve-tool-builder

Conversation

@onur-ozkan
Copy link
Contributor

@onur-ozkan onur-ozkan commented May 30, 2024 •
edited
Loading

Previously, we were running bare commands for ToolBuild step and were unable to utilize some of the flags which are already handled by compile::stream_cargo.

This change makes ToolBuild to use compile::stream_cargo, allowing us to benefit from the flags supported by the bootstrap cargo.

Resolves #125666

@rustbot
Copy link
Collaborator

rustbot commented May 30, 2024

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 30, 2024
@onur-ozkan onur-ozkan force-pushed the improve-tool-builder branch from e204a32 to 3d8666e Compare May 30, 2024 17:24
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan onur-ozkan force-pushed the improve-tool-builder branch from 3d8666e to 1b271c2 Compare May 30, 2024 18:02
@onur-ozkan onur-ozkan added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 30, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan onur-ozkan force-pushed the improve-tool-builder branch from 1b271c2 to d9c6761 Compare May 30, 2024 20:26
@onur-ozkan onur-ozkan changed the title use compile::cargo_run for building tools prefer compile::stream_cargo for building tools May 30, 2024
@onur-ozkan
Copy link
Contributor Author

onur-ozkan commented May 30, 2024

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 30, 2024
@bors
Copy link
Collaborator

bors commented Jun 6, 2024

☔ The latest upstream changes (presumably #125411) made this pull request unmergeable. Please resolve the merge conflicts.

@onur-ozkan
prefer compile::stream_cargo for building tools
c76e59e 
Previously, we were running bare commands for `ToolBuild` step and
were unable to utilize some of the flags which  are already handled by
`compile::stream_cargo`.

This change makes `ToolBuild` to use `compile::stream_cargo`, allowing us
to benefit from the flags supported by the bootstrap cargo.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan onur-ozkan force-pushed the improve-tool-builder branch from d9c6761 to c76e59e Compare June 6, 2024 17:06
albertlarsan68
albertlarsan68 approved these changes Jun 7, 2024
View reviewed changes
Copy link
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@albertlarsan68
Copy link
Member

albertlarsan68 commented Jun 7, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 7, 2024

📌 Commit c76e59e has been approved by albertlarsan68

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 7, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 7, 2024
@matthiaskrgr
Rollup merge of rust-lang#125781 - onur-ozkan:improve-tool-builder, r…
49031fd 
…=albertlarsan68

prefer `compile::stream_cargo` for building tools

Previously, we were running bare commands for `ToolBuild` step and were unable to utilize some of the flags which  are already handled by `compile::stream_cargo`.

This change makes `ToolBuild` to use `compile::stream_cargo`, allowing us to benefit from the flags supported by the bootstrap cargo.

Resolves rust-lang#125666
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 7, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@bors
Auto merge of rust-lang#126124 - matthiaskrgr:rollup-deswks3, r=matth…
6caf9d3 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#116088 (Stabilise `c_unwind`)
 - rust-lang#124012 (Stabilize `binary_heap_as_slice`)
 - rust-lang#124214 (Parse unsafe attributes)
 - rust-lang#125572 (Detect pub structs never constructed and unused associated constants)
 - rust-lang#125781 (prefer `compile::stream_cargo` for building tools)
 - rust-lang#126030 (Update `./x fmt` command in library/std/src/sys/pal/windows/c/README.md)
 - rust-lang#126047 (Simplify the rayon calls in the installer)
 - rust-lang#126070 (Enable f16 in assembly on aarch64 platforms that support it)
 - rust-lang#126089 (Stabilize Option::take_if)
 - rust-lang#126112 (Clean up source root in run-make tests)
 - rust-lang#126119 (Improve docs for using custom paths with `--emit`)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 7, 2024
@matthiaskrgr
Rollup merge of rust-lang#125781 - onur-ozkan:improve-tool-builder, r…
37926ee 
…=albertlarsan68

prefer `compile::stream_cargo` for building tools

Previously, we were running bare commands for `ToolBuild` step and were unable to utilize some of the flags which  are already handled by `compile::stream_cargo`.

This change makes `ToolBuild` to use `compile::stream_cargo`, allowing us to benefit from the flags supported by the bootstrap cargo.

Resolves rust-lang#125666
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 7, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@bors
Auto merge of rust-lang#126126 - matthiaskrgr:rollup-541x5a6, r=matth…
9d471f2 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#116088 (Stabilise `c_unwind`)
 - rust-lang#124012 (Stabilize `binary_heap_as_slice`)
 - rust-lang#124214 (Parse unsafe attributes)
 - rust-lang#125572 (Detect pub structs never constructed and unused associated constants)
 - rust-lang#125781 (prefer `compile::stream_cargo` for building tools)
 - rust-lang#126030 (Update `./x fmt` command in library/std/src/sys/pal/windows/c/README.md)
 - rust-lang#126047 (Simplify the rayon calls in the installer)
 - rust-lang#126089 (Stabilize Option::take_if)
 - rust-lang#126112 (Clean up source root in run-make tests)
 - rust-lang#126119 (Improve docs for using custom paths with `--emit`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 7, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@bors
Auto merge of rust-lang#126134 - matthiaskrgr:rollup-vzlegsc, r=matth…
804421d 
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#124012 (Stabilize `binary_heap_as_slice`)
 - rust-lang#124214 (Parse unsafe attributes)
 - rust-lang#125572 (Detect pub structs never constructed and unused associated constants)
 - rust-lang#125781 (prefer `compile::stream_cargo` for building tools)
 - rust-lang#126030 (Update `./x fmt` command in library/std/src/sys/pal/windows/c/README.md)
 - rust-lang#126047 (Simplify the rayon calls in the installer)
 - rust-lang#126052 (More `rustc_parse` cleanups)
 - rust-lang#126077 (Revert "Use the HIR instead of mir_keys for determining whether something will have a MIR body.")
 - rust-lang#126089 (Stabilize Option::take_if)
 - rust-lang#126112 (Clean up source root in run-make tests)
 - rust-lang#126119 (Improve docs for using custom paths with `--emit`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 65fcba6 into rust-lang:master Jun 7, 2024
@rustbot rustbot added this to the 1.80.0 milestone Jun 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@rust-timer
Unrolled build for rust-lang#125781
2564806 
Rollup merge of rust-lang#125781 - onur-ozkan:improve-tool-builder, r=albertlarsan68

prefer `compile::stream_cargo` for building tools

Previously, we were running bare commands for `ToolBuild` step and were unable to utilize some of the flags which  are already handled by `compile::stream_cargo`.

This change makes `ToolBuild` to use `compile::stream_cargo`, allowing us to benefit from the flags supported by the bootstrap cargo.

Resolves rust-lang#125666
@onur-ozkan onur-ozkan deleted the improve-tool-builder branch June 7, 2024 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@albertlarsan68 albertlarsan68 albertlarsan68 approved these changes

Assignees

@albertlarsan68 albertlarsan68

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.80.0

Development

Successfully merging this pull request may close these issues.

"--json-output" is ignored by tool builds

5 participants

@onur-ozkan @rustbot @rust-log-analyzer @bors @albertlarsan68