Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always set RUSTC_BOOTSTRAP with x doc #109667

Merged
merged 1 commit into from
Mar 28, 2023
Merged

Conversation

clubby789
Copy link
Contributor

Fixes #100060

Note that there is still a warning - the unused_allocation lint does not fire in stage 0, but that's just a matter of waiting for #104363 to land in beta

@rustbot
Copy link
Collaborator

rustbot commented Mar 27, 2023

r? @ozkanonur

(rustbot has picked a reviewer for you, use r? to override)

@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 Mar 27, 2023
cmd.env("RUSTC_BOOTSTRAP", "1");
}
// We need to validate nightly features, even on the stable channel.
// Set this unconditionally as the stage0 compiler may be being used to
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// Set this unconditionally as the stage0 compiler may be being used to
// Set this unconditionally as the stage0 compiler may be be used to

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Isn't may be being used correct? I was trying to write in the present tense and I think may be used would be future tense

Copy link
Member

@est31 est31 Mar 27, 2023

Choose a reason for hiding this comment

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

I'm not a native speaker. I've first made this comment because it sounded wrong to me, but according to the internet it is correct use although people do say that it's not very commonly used.

(edit: and yes I wanted to suggest may be used instead of may be be used)

Copy link
Member

Choose a reason for hiding this comment

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

AFAIK they both correct. In our particular use case may be being used fits better.

Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the fix :)

@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 27, 2023

📌 Commit 9fc7eca has been approved by ozkanonur

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 Mar 27, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2023
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#108548 (Clarify the 'use a constant in a pattern' error message)
 - rust-lang#109565 (Improve documentation for E0223)
 - rust-lang#109661 (Fix LVI test post LLVM 16 update)
 - rust-lang#109667 (Always set `RUSTC_BOOTSTRAP` with `x doc`)
 - rust-lang#109669 (Update books)
 - rust-lang#109678 (Don't shadow the `dep_node` var in `incremental_verify_ich_failed`)
 - rust-lang#109682 (Add `#[inline]` to CStr trait implementations)
 - rust-lang#109685 (Make doc comment a little bit more accurate)
 - rust-lang#109687 (Document the heuristics IsTerminal uses on Windows)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1af75b1 into rust-lang:master Mar 28, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

./x.py doc on a clean repo on master passes, but with warnings about feature gates
5 participants