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

Jump to bottom

Use x.py check instead of cargo check for build scripts #1384

Merged
merged 1 commit into from
Jul 6, 2022
Merged

Use x.py check instead of cargo check for build scripts #1384

merged 1 commit into from
Jul 6, 2022

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jul 3, 2022

Cargo check isn't supported and gives an error that CFG_CHANNEL is missing.
It also generates a new target dir and recompiles dependencies.
Use x.py instead, which avoids both issues.

cc @jonas-schievink

@jyn514
Use x.py check instead of cargo check for build scripts
2fa0d54 
Cargo check isn't supported and gives an error that CFG_CHANNEL is missing.
It also generates a new target dir and recompiles dependencies.
Use x.py instead, which avoids both issues.
jonas-schievink
jonas-schievink reviewed Jul 4, 2022
View reviewed changes
Copy link
Contributor

@jonas-schievink jonas-schievink left a comment

Choose a reason for hiding this comment

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

Seems fine to make this change if it works

src/building/suggested.md Show resolved Hide resolved
RalfJung
RalfJung reviewed Jul 4, 2022
View reviewed changes
src/building/suggested.md
"-p",
"rustc_driver",
"--message-format=json"
"--json-output"
],
Copy link
Member

Choose a reason for hiding this comment

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

I assume RA will append to that the crate it cares about, or so? Because just running this command will check a lot of things^^ The old command specifically passed rustc_driver, so this one could pass "compiler/rustc_driver" or "compiler/rustc" or so?

Copy link
Member

Choose a reason for hiding this comment

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

No, but RA just runs this command once for everything. It also avoids actually checking anything using RUSTC_WRAPPER.

Copy link
Member

Choose a reason for hiding this comment

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

RUSTC_WRAPPER isn't supported by x.py.

(Looks like you removed this comment but it still got sent out to everyone via notifications so people only reading the mails will be very confused... deleting comments is not a good idea)

Florian says the opposite here

@RalfJung RalfJung mentioned this pull request Jul 4, 2022
Merged
@RalfJung
Copy link
Member

RalfJung commented Jul 4, 2022

This contradicts #1341. But using x.py makes most sense I think? That will ensure it passes all the right flags to cargo.

bors added a commit to rust-lang/miri that referenced this pull request Jul 4, 2022
@bors
Auto merge of #2326 - RalfJung:vscode, r=RalfJung
f338e62 
update vscode settings

Following [this recommendation](https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/.22target.22.20directory.20in.20rustc.20tree.3F/near/288428273)
Cc rust-lang/rustc-dev-guide#1384
@fee1-dead fee1-dead mentioned this pull request Jul 5, 2022
Closed
@spastorino spastorino merged commit 07efe00 into rust-lang:master Jul 6, 2022
@jyn514 jyn514 deleted the build-scripts branch July 6, 2022 22:13
@ehuss ehuss mentioned this pull request Jul 22, 2022
Merged
RalfJung added a commit to RalfJung/rust that referenced this pull request Jul 22, 2022
@RalfJung
Rollup merge of rust-lang#99588 - ehuss:update-books, r=ehuss
e51a476 
Update books

## nomicon

1 commits in 70db9e4189f64d1d8e2451b1046111fb356b6dc2..8d1e4dccf71114ff56f328f671f2026d8e6b62a2
2022-06-27 20:47:21 +0900 to 2022-07-18 18:12:35 -0400
- Should be `align_of` instead of `size_of`

## reference

11 commits in 9fce337a55ee4a4629205f6094656195cecad231..a92be0fef439b3d8e0468d82cb24812d303520a0
2022-06-22 13:59:28 -0700 to 2022-07-21 19:01:23 -0700
- Add `IntoFuture::into_future` desugaring (rust-lang/reference#1233)
- Remove uses of the phrase "in Rust" (rust-lang/reference#1241)
- Revert "Add stable references of `macro_metavar_expr`" (rust-lang/reference#1242)
- tweaks
- further tweak addr_of exposition
- edits
- Apply suggestions from code review
- document raw-addr-of operators
- update union field type rules (rust-lang/reference#1238)
- clarify that references size_of_val can never exceed isize::MAX (rust-lang/reference#1186)
- Describe what `windows_subsystem` does (rust-lang/reference#1232)

## book

9 commits in cf2653a5ca553cbbb4a17f1a7db1947820f6a775..36383b4da21dbd0a0781473bc8ad7ef0ed1b6751
2022-07-05 12:07:58 -0400 to 2022-07-19 21:03:20 -0400
- Update ch16-02-message-passing.md
- Update snapshots with edits made to src that need to be checked
- Remove inconsistent newline. Fixes rust-lang/book#3240.
- add missing `b` in chapter 15.6
- Grammar: corrected 'as much' to 'as such'
- grammar: add missing 'of'
- Fix incorrect link for listing 13-06
- Correct method name
- Remove unused theme directories.

## rust-by-example

2 commits in 83724ca387a2a1cd3e8d848f62820020760e358b..3155db49b0d57cd82c65456ac210b69ecec5ccb1
2022-07-05 10:38:07 -0300 to 2022-07-05 20:35:53 -0300
- fix-type (rust-lang/rust-by-example#1565)
- add-examples-to-destructure-tuples (rust-lang/rust-by-example#1566)

## rustc-dev-guide

27 commits in eb83839e903a0a8f1406f7e941886273f189b26b..d5201cddace979b299ec1bf9fd8997338151aa9d
2022-07-03 15:17:39 +0900 to 2022-07-21 04:48:49 +0200
- Debuginfo tests now also support revisions.
- Link to rendered book directly
- Fix link to clippy sync docs
- remove stray markup
- renamed
- sync with hackmd version
- replace misleading name (rust-lang/rustc-dev-guide#1401)
- Remove a mention to Steve on r? example
- obey line length limit (part 3)
- obey line length limit (part 2)
- obey line length limit
- sync with hackmd
- add draft chapter
- add mdbook-mermaid
- use relative links
- fix some typos (rust-lang/rustc-dev-guide#1398)
- typo: monomorph docs
- Rename debugging_opts to unstable_opts, use link
- address review comment
- update date reference on MIR inliner
- remove outdated info on debugging
- small fixes to ty chapter (rust-lang/rustc-dev-guide#1390)
- Update the build instructions for the standard library
- overview.md: Link to existing Macro Expansion and Name Resolution docs (rust-lang/rustc-dev-guide#1388)
- Git-ignore `pulls.json` (rust-lang/rustc-dev-guide#1386)
- Revert "Add the config needed to get rust-analyzer working on src/bootstrap (rust-lang/rustc-dev-guide#1381)"
- Use `x.py check` instead of `cargo check` for build scripts (rust-lang/rustc-dev-guide#1384)
@jyn514
Copy link
Member Author

jyn514 commented Aug 8, 2022 •
edited
Loading

an example where this matters, even with rust-analyzer's shim:

  thread 'main' panicked at 'REAL_LIBRARY_PATH_VAR', compiler\rustc_llvm\build.rs:49:59

this variable is set by bootstrap and required for correctness.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonas-schievink jonas-schievink jonas-schievink left review comments

@flodiebold flodiebold flodiebold left review comments

@RalfJung RalfJung RalfJung left review comments

@spastorino spastorino spastorino approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jyn514 @RalfJung @spastorino @flodiebold @jonas-schievink