Skip to content

Conversation

lukas-code
Copy link
Member

@lukas-code lukas-code commented Jun 23, 2023

  • x doc compiler now documents all of compiler, not just rustc_driver.
  • x doc with compiler docs enabled now includes rustc-main and rustc_smir. rustc_codegen_llvm is only included if the LLVM backend is enabled, which is the default.
  • x doc library now excludes sysroot.
  • x check compiler and x check library now properly check tests/benches/examples of all compiler or library crates, respectively. Note that x check compiler will check the library artifacts, but not tests.

fixes the fallout from #111955, cc @jyn514

@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 2023

r? @albertlarsan68

(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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 23, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval

@rust-log-analyzer

This comment has been minimized.

@jyn514
Copy link
Member

jyn514 commented Jun 23, 2023

cc #112440

@lukas-code lukas-code force-pushed the bootstrap-alias-default-crates branch 2 times, most recently from abf2ad7 to d9f4fb3 Compare June 24, 2023 11:52
Copy link
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

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

LGTM, r=me with this change

@@ -1,6 +1,6 @@
//! The WIP stable interface to rustc internals.
//!
//! For more information see https://github.com/rust-lang/project-stable-mir
//! For more information see <https://github.com/rust-lang/project-stable-mir>
Copy link
Member

Choose a reason for hiding this comment

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

Can you remove this change?

Copy link
Member Author

Choose a reason for hiding this comment

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

This triggers the rustdoc::bare_urls lint. Because this PR builds the docs for rustc_smir now, that causes the build to fail.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the explanation

@albertlarsan68
Copy link
Member

@bors rollup

@albertlarsan68 albertlarsan68 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2023
@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+

@bors
Copy link
Collaborator

bors commented Jul 13, 2023

📌 Commit d9f4fb3 has been approved by albertlarsan68

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 13, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
…-crates, r=albertlarsan68

bootstrap: update defaults for `compiler` and `library` aliases

* `x doc compiler` now documents all of compiler, not just `rustc_driver`.
* `x doc` with compiler docs enabled now includes `rustc-main` and `rustc_smir`. `rustc_codegen_llvm` is only included if the LLVM backend is enabled, which is the default.
* `x doc library` now excludes `sysroot`.
* `x check compiler` and `x check library` now properly check tests/benches/examples of all compiler or library crates, respectively. Note that `x check compiler` will check the library artifacts, but not tests.

fixes the fallout from rust-lang#111955, cc `@jyn514`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
…-crates, r=albertlarsan68

bootstrap: update defaults for `compiler` and `library` aliases

* `x doc compiler` now documents all of compiler, not just `rustc_driver`.
* `x doc` with compiler docs enabled now includes `rustc-main` and `rustc_smir`. `rustc_codegen_llvm` is only included if the LLVM backend is enabled, which is the default.
* `x doc library` now excludes `sysroot`.
* `x check compiler` and `x check library` now properly check tests/benches/examples of all compiler or library crates, respectively. Note that `x check compiler` will check the library artifacts, but not tests.

fixes the fallout from rust-lang#111955, cc ``@jyn514``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
…-crates, r=albertlarsan68

bootstrap: update defaults for `compiler` and `library` aliases

* `x doc compiler` now documents all of compiler, not just `rustc_driver`.
* `x doc` with compiler docs enabled now includes `rustc-main` and `rustc_smir`. `rustc_codegen_llvm` is only included if the LLVM backend is enabled, which is the default.
* `x doc library` now excludes `sysroot`.
* `x check compiler` and `x check library` now properly check tests/benches/examples of all compiler or library crates, respectively. Note that `x check compiler` will check the library artifacts, but not tests.

fixes the fallout from rust-lang#111955, cc ```@jyn514```
@matthiaskrgr
Copy link
Member

@bors r-
probably fails here #113669 (comment)
feel free to reapprove if you think there this is not actually the cause

@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 Jul 13, 2023
@lukas-code
Copy link
Member Author

Yeah that rollup failure is definitely caused by this PR. It's more broken docs for rustc_smir that got revealed, because this PR actually builds the docs now.

@albertlarsan68
Copy link
Member

@oli-obk, @celinval What do you think about this failure? Do not merge this PR or fix the docs?

@lukas-code lukas-code force-pushed the bootstrap-alias-default-crates branch from d9f4fb3 to 1339ccf Compare July 13, 2023 20:26
@jyn514
Copy link
Member

jyn514 commented Jul 13, 2023

certainly fix the docs

@bors
Copy link
Collaborator

bors commented Jul 14, 2023

☔ The latest upstream changes (presumably #113676) made this pull request unmergeable. Please resolve the merge conflicts.

@lukas-code lukas-code force-pushed the bootstrap-alias-default-crates branch from 1339ccf to 9d6bfc2 Compare July 14, 2023 09:57
@albertlarsan68
Copy link
Member

@bors r+ rollup=maybe

@bors
Copy link
Collaborator

bors commented Jul 14, 2023

📌 Commit 9d6bfc2 has been approved by albertlarsan68

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 14, 2023
@bors
Copy link
Collaborator

bors commented Jul 14, 2023

⌛ Testing commit 9d6bfc2 with merge bacf5bc...

@bors
Copy link
Collaborator

bors commented Jul 14, 2023

☀️ Test successful - checks-actions
Approved by: albertlarsan68
Pushing bacf5bc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 14, 2023
@bors bors merged commit bacf5bc into rust-lang:master Jul 14, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 14, 2023
@lukas-code lukas-code deleted the bootstrap-alias-default-crates branch July 14, 2023 14:03
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bacf5bc): 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)
- - 0
Regressions ❌
(secondary)
2.8% [2.2%, 3.4%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 658.312s -> 659.454s (0.17%)

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-compiler Relevant to the compiler 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