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.

Sign up for GitHub

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
+5 −4
Merged

Always set RUSTC_BOOTSTRAP with x doc #109667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/bootstrap/doc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,10 +1027,11 @@ impl Step for RustcBook {
if self.validate {
cmd.arg("--validate");
}
if !builder.unstable_features() {
// We need to validate nightly features, even on the stable channel.
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 •
edited
Loading

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.

// document.
cmd.env("RUSTC_BOOTSTRAP", "1");

// If the lib directories are in an unusual location (changed in
// config.toml), then this needs to explicitly update the dylib search
// path.
Expand Down