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

bootstrap: cleanup the list of extra check cfgs #107080

Merged
merged 2 commits into from
Jan 30, 2023
Merged

bootstrap: cleanup the list of extra check cfgs #107080

merged 2 commits into from
Jan 30, 2023

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Jan 19, 2023 •
edited
Loading

This PR performs some cleanups on the EXTRA_CHECK_CFGS list in bootstrap.

Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).

@rustbot
Copy link
Collaborator

rustbot commented Jan 19, 2023

r? @Mark-Simulacrum

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

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 19, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 19, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Urgau Urgau force-pushed the cleanup-bootstrap-extra-check-cfgs branch from d94ee45 to cc00a21 Compare January 19, 2023 17:34
@rustbot
Copy link
Collaborator

rustbot commented Jan 19, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@Urgau Urgau mentioned this pull request Jan 19, 2023
Merged
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jan 21, 2023

📌 Commit cc00a21 has been approved by Mark-Simulacrum

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 Jan 21, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 22, 2023
@compiler-errors
Rollup merge of rust-lang#107080 - Urgau:cleanup-bootstrap-extra-chec…
10057f5 
…k-cfgs, r=Mark-Simulacrum

bootstrap: cleanup the list of extra check cfgs

This PR performs some cleanups on the `EXTRA_CHECK_CFGS` list in bootstrap.

- `target_os=watchos`: no longer relevant because there are now proper targets `*-apple-watchos`
 - `target_arch=nvptx64`: target `nvptx64-nvidia-cuda` makes it useless
 - `target_arch=le32`: target was removed (rust-lang#45041)
 - ~~`release`: was removed from rustfmt (rust-lang/rustfmt#5375 and rust-lang/rustfmt#5449 (despite the changes being done more than 6 months ago there hasn't been any rustfmt subtree sync)
 - `dont_compile_me`: was removed from stdarch (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).
@compiler-errors compiler-errors mentioned this pull request Jan 22, 2023
Closed
@matthiaskrgr
Copy link
Member

@bors r- failed in a rollup
https://github.com/rust-lang-ci/rust/actions/runs/3979179804/jobs/6821444168#step:26:8323
#107183

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 22, 2023
@Urgau Urgau force-pushed the cleanup-bootstrap-extra-check-cfgs branch 2 times, most recently from ae17e41 to e6e3db9 Compare January 22, 2023 17:34
@Urgau
Copy link
Member Author

Urgau commented Jan 22, 2023

Forgot to remove a target_arch="le32" in fuschia and l4re. I've verified with rg "\"le32\"" that no other le32 are found in the repository. Should be ready to go.

@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 Jan 22, 2023
Urgau added 2 commits January 25, 2023 15:07
@Urgau
Remove outdated cfg on le32
dde74fe 
See rust-lang#45041 for the removal of the
target (le32-unknown-nacl).
@Urgau
Cleanup extra check configs in bootstrap
a01a540 
 - `target_os=watchos`: no longer relevant because there are now proper
   targets `*-apple-watchos`
 - `target_arch=nvptx64`: `nvptx64-nvidia-cuda`
 - `target_arch=le32`: target was removed
   (rust-lang#45041)
 - `release`: was removed from rustfmt
   (rust-lang/rustfmt#5375 and
   rust-lang/rustfmt#5449)
 - `dont_compile_me`: was removed from stdarch
   (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for
rustc and rustc tools (as to not have the Standard Library
unintentionally depend on them).
@Urgau Urgau force-pushed the cleanup-bootstrap-extra-check-cfgs branch from e6e3db9 to a01a540 Compare January 25, 2023 14:20
@Urgau
Copy link
Member Author

Urgau commented Jan 25, 2023

A rustfmt subtree sync has been done (#107275), so I've re-removed the release cfg.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 29, 2023

📌 Commit a01a540 has been approved by Mark-Simulacrum

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 Jan 29, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 29, 2023
@compiler-errors
Rollup merge of rust-lang#107080 - Urgau:cleanup-bootstrap-extra-chec…
7389172 
…k-cfgs, r=Mark-Simulacrum

bootstrap: cleanup the list of extra check cfgs

This PR performs some cleanups on the `EXTRA_CHECK_CFGS` list in bootstrap.

- `target_os=watchos`: no longer relevant because there are now proper targets `*-apple-watchos`
 - `target_arch=nvptx64`: target `nvptx64-nvidia-cuda` makes it useless
 - `target_arch=le32`: target was removed (rust-lang#45041)
 - `release`: was removed from rustfmt (rust-lang/rustfmt#5375 and rust-lang/rustfmt#5449)
 - `dont_compile_me`: was removed from stdarch (rust-lang/stdarch#1308)

Also made some external cfg exception mode clear and only activated for rustc and rustc tools (as to not have the Standard Library unintentionally depend on them).
@compiler-errors compiler-errors mentioned this pull request Jan 29, 2023
Closed
@bors
Copy link
Contributor

bors commented Jan 30, 2023

⌛ Testing commit a01a540 with merge b06d5b404ea8f980afe1387f0e0ba85d0bd20aaf...

@bors
Copy link
Contributor

bors commented Jan 30, 2023

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 30, 2023
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@Urgau
Copy link
Member Author

Urgau commented Jan 30, 2023

Seems like the checkout of the src/doc/edition-guide submodule never happened in more than 4h, leading to the timeout. This failure is completely unrelated to this PR, should be retried.

@albertlarsan68
Copy link
Member

@bors retry (supurious timeout downloading submodules)

@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 Jan 30, 2023
@bors
Copy link
Contributor

bors commented Jan 30, 2023

⌛ Testing commit a01a540 with merge 006ca9b...

@bors
Copy link
Contributor

bors commented Jan 30, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 006ca9b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 30, 2023
@bors bors merged commit 006ca9b into rust-lang:master Jan 30, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 30, 2023
@bors bors mentioned this pull request Jan 30, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (006ca9b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 4.7% [4.7%, 4.7%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.3% [-2.3%, -2.3%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.2% [-2.3%, 4.7%] 2

Cycles

This benchmark run did not return any relevant results for this metric.

@Urgau Urgau deleted the cleanup-bootstrap-extra-check-cfgs branch May 5, 2023 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
merged-by-bors This PR was explicitly merged by bors. 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) T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.
8 participants
@Urgau @rustbot @rust-log-analyzer @Mark-Simulacrum @bors @matthiaskrgr @albertlarsan68 @rust-timer