Skip to content

bootstrap: cleanup the list of extra check cfgs#107080

Merged
bors merged 2 commits into
rust-lang:masterfrom
Urgau:cleanup-bootstrap-extra-check-cfgs
Jan 30, 2023
Merged

bootstrap: cleanup the list of extra check cfgs#107080
bors merged 2 commits into
rust-lang:masterfrom
Urgau:cleanup-bootstrap-extra-check-cfgs

Conversation

@Urgau

@Urgau Urgau commented Jan 19, 2023

Copy link
Copy Markdown
Member

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

rustbot commented Jan 19, 2023

Copy link
Copy Markdown
Collaborator

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

rustbot commented Jan 19, 2023

Copy link
Copy Markdown
Collaborator

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.

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

rustbot commented Jan 19, 2023

Copy link
Copy Markdown
Collaborator

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

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+ rollup=iffy

@bors

bors commented Jan 21, 2023

Copy link
Copy Markdown
Collaborator

📌 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
…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).
@matthiaskrgr

Copy link
Copy Markdown
Member

@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

Urgau commented Jan 22, 2023

Copy link
Copy Markdown
Member Author

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
See rust-lang#45041 for the removal of the
target (le32-unknown-nacl).
 - `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

Urgau commented Jan 25, 2023

Copy link
Copy Markdown
Member Author

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

@Mark-Simulacrum

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 29, 2023

Copy link
Copy Markdown
Collaborator

📌 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
…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).
@bors

bors commented Jan 30, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a01a540 with merge b06d5b404ea8f980afe1387f0e0ba85d0bd20aaf...

@bors

bors commented Jan 30, 2023

Copy link
Copy Markdown
Collaborator

💥 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
Copy Markdown
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

Urgau commented Jan 30, 2023

Copy link
Copy Markdown
Member Author

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
Copy Markdown
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

bors commented Jan 30, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a01a540 with merge 006ca9b...

@bors

bors commented Jan 30, 2023

Copy link
Copy Markdown
Collaborator

☀️ 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
@rust-timer

Copy link
Copy Markdown
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

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

Development

Successfully merging this pull request may close these issues.

8 participants