Skip to content

Commit

Permalink
Unrolled build for rust-lang#130965
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#130965 - onur-ozkan:bootstrap-step-trait-doc, r=Mark-Simulacrum

make `Step` doc-comments more clear

Aiming to improve complicated `Step` documentation. Once we merge this, I will update [this page](https://rustc-dev-guide.rust-lang.org/building/bootstrapping/how-bootstrap-does-it.html?highlight=Step#synopsis-of--step) too.
  • Loading branch information
rust-timer authored Oct 13, 2024
2 parents 6b9676b + 8ef0ba2 commit 18d61f5
Showing 1 changed file with 22 additions and 18 deletions.
40 changes: 22 additions & 18 deletions src/bootstrap/src/core/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,36 +72,40 @@ impl<'a> Deref for Builder<'a> {
}

pub trait Step: 'static + Clone + Debug + PartialEq + Eq + Hash {
/// `PathBuf` when directories are created or to return a `Compiler` once
/// it's been assembled.
/// Result type of `Step::run`.
type Output: Clone;

/// Whether this step is run by default as part of its respective phase.
/// `true` here can still be overwritten by `should_run` calling `default_condition`.
/// Whether this step is run by default as part of its respective phase, as defined by the `describe`
/// macro in [`Builder::get_step_descriptions`].
///
/// Note: Even if set to `true`, it can still be overridden with [`ShouldRun::default_condition`]
/// by `Step::should_run`.
const DEFAULT: bool = false;

/// If true, then this rule should be skipped if --target was specified, but --host was not
const ONLY_HOSTS: bool = false;

/// Primary function to execute this rule. Can call `builder.ensure()`
/// with other steps to run those.
/// Primary function to implement `Step` logic.
///
/// This function can be triggered in two ways:
/// 1. Directly from [`Builder::execute_cli`].
/// 2. Indirectly by being called from other `Step`s using [`Builder::ensure`].
///
/// This gets called twice during a normal `./x.py` execution: first
/// with `dry_run() == true`, and then for real.
/// When called with [`Builder::execute_cli`] (as done by `Build::build`), this function executed twice:
/// - First in "dry-run" mode to validate certain things (like cyclic Step invocations,
/// directory creation, etc) super quickly.
/// - Then it's called again to run the actual, very expensive process.
///
/// When triggered indirectly from other `Step`s, it may still run twice (as dry-run and real mode)
/// depending on the `Step::run` implementation of the caller.
fn run(self, builder: &Builder<'_>) -> Self::Output;

/// When bootstrap is passed a set of paths, this controls whether this rule
/// will execute. However, it does not get called in a "default" context
/// when we are not passed any paths; in that case, `make_run` is called
/// directly.
/// Determines if this `Step` should be run when given specific paths (e.g., `x build $path`).
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_>;

/// Builds up a "root" rule, either as a default rule or from a path passed
/// to us.
///
/// When path is `None`, we are executing in a context where no paths were
/// passed. When `./x.py build` is run, for example, this rule could get
/// called if it is in the correct list below with a path of `None`.
/// Called directly by the bootstrap `Step` handler when not triggered indirectly by other `Step`s using [`Builder::ensure`].
/// For example, `./x.py test bootstrap` runs this for `test::Bootstrap`. Similarly, `./x.py test` runs it for every step
/// that is listed by the `describe` macro in [`Builder::get_step_descriptions`].
fn make_run(_run: RunConfig<'_>) {
// It is reasonable to not have an implementation of make_run for rules
// who do not want to get called from the root context. This means that
Expand Down

0 comments on commit 18d61f5

Please sign in to comment.