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

Rollup of 6 pull requests #99826

Closed
wants to merge 15 commits into from
Closed

Rollup of 6 pull requests #99826

wants to merge 15 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

belovdv and others added 15 commits July 26, 2022 13:55
@belovdv
Lib kind -l link-arg:
7d4a98e 
arbitrary link argument like -C link-arg, but respecting relative order to other `-l` options, unstable
@JohnTitor
Update mentions to rustc_metadata::rmeta::Lazy
645a883 
Signed-off-by: Yuki Okushi <[email protected]>
@dvdhrm
doc/rustc: describe the uefi target platforms
e849f9b 
Add a `platform-support` entry to the rustc-docs for the different
`*-unknown-uefi` targets. This describes in detail how this platform
works, a few basic examples, and how to compile for the platform.

Red Hat is sponsoring my work on this platform, so I am putting myself
down as target maintainer. Co-maintainers are more than welcome to join
me in the effort. Communication is going on off-list to coordinate the
different efforts.

Note that the ultimate goal is to move the UEFI targets to Tier-2 so
bootloaders can be more easily supported in commercial products. This
documentation is the first step towards that goal, but should be a
viable documentation even for the current Tier-3 status of the targets.

I also want to point out that there is an ongoing GSoC-effort to port
the rust standard library to UEFI (by Ayush Singh). While this work is
not necessarily required to get to Tier-2, we definitely should
coordinate the efforts and update the documentation as soon as any such
ports are merged.

Note that the targets are already used by multiple commercial and non
commercial production systems, including, but not limited to:

 * Tianocore-EDK2 (Official UEFI SDK by Intel) comes with rust support
   in its staging repository (not part of any release, yet).
   (https://github.com/tianocore/edk2-staging/tree)
 * Intel's research program "Project Mu" uses the rust UEFI targets to
   show possible future replacements for Tianocore-EDK2.
 * The Rust OS "Redox" uses the UEFI targets for its bootloader.
   (https://www.redox-os.org/)
 * The hugely popular in-depth documentation of OS development in Rust
   by Philipp Oppermann uses the UEFI targets.
   (https://os.phil-opp.com/)

Signed-off-by: David Rheinsberg <[email protected]>
@GuillaumeGomez
Fix settings display on small screen size
9d118c5
@GuillaumeGomez
Add GUI test for settings in small device
1564305
@bstrie
Allow using stable os::fd::raw items through unstable os::wasi module
0eb28ab 
This fixes a regression from stable to nightly.

Closes rust-lang#99502.
@notriddle
rustdoc: remove Clean trait impl for ty::Term
8aca883
@notriddle
rustdoc: remove Clean trait impl for hir::Term
3ea9916
@notriddle
rustdoc: remove Clean trait impl for ty::GenericParamDef
2f03cbd
@GuillaumeGomez
Rollup merge of rust-lang#99467 - BelovDV:add_option_link_arg, r=petr…
be06049 
…ochenkov

flag '-l link-arg=___ was added

rust-lang#99427
@GuillaumeGomez
Rollup merge of rust-lang#99723 - bstrie:wasifd, r=yaahc
494808f 
Allow using stable os::fd::raw items through unstable os::wasi module

This fixes a regression from stable to nightly.

Closes rust-lang#99502.
@GuillaumeGomez
Rollup merge of rust-lang#99760 - dvdhrm:rw/uefiplat, r=ehuss
d7a6484 
doc/rustc: describe the uefi target platforms

Add a `platform-support` entry to the rustc-docs for the different `*-unknown-uefi` targets. This describes in detail how this platform works, a few basic examples, and how to compile for the platform.

Red Hat is sponsoring my work on this platform, so I am putting myself down as target maintainer. Co-maintainers are more than welcome to join me in the effort. Communication is going on off-list to coordinate the different efforts.

Note that the ultimate goal is to move the UEFI targets to Tier-2 so bootloaders can be more easily supported in commercial products. This documentation is the first step towards that goal, but should be a viable documentation even for the current Tier-3 status of the targets.

I also want to point out that there is an ongoing GSoC-effort to port the rust standard library to UEFI (by Ayush Singh). While this work is not necessarily required to get to Tier-2, we definitely should coordinate the efforts and update the documentation as soon as any such ports are merged.

Note that the targets are already used by multiple commercial and non commercial production systems, including, but not limited to:

 * Tianocore-EDK2 (Official UEFI SDK by Intel) comes with rust support
   in its staging repository (not part of any release, yet).
   (https://github.com/tianocore/edk2-staging/tree)
 * Intel's research program "Project Mu" uses the rust UEFI targets to
   show possible future replacements for Tianocore-EDK2.
 * The Rust OS "Redox" uses the UEFI targets for its bootloader.
   (https://www.redox-os.org/)
 * The hugely popular in-depth documentation of OS development in Rust
   by Philipp Oppermann uses the UEFI targets.
   (https://os.phil-opp.com/)
@GuillaumeGomez
Rollup merge of rust-lang#99803 - JohnTitor:update-lazy-docs, r=compi…
f4f01b3 
…ler-errors

Update mentions to `rustc_metadata::rmeta::Lazy`

While working on rust-lang/rustc-dev-guide#1411, I noticed there are still some mentions of `Lazy`. This updates them to `LazyValue`, `LazyArray`, or `LazyTable`.

r? ``@compiler-errors``

Signed-off-by: Yuki Okushi <[email protected]>
@GuillaumeGomez
Rollup merge of rust-lang#99810 - GuillaumeGomez:fix-settings-slider-…
06a9299 
…small-width, r=notriddle

Fix settings slider on small width screens

Fixes rust-lang#99794.

Screenshot of the fix:

![Screenshot from 2022-07-27 14-17-08](https://user-images.githubusercontent.com/3050060/181250007-55f982d1-89db-45b7-a4f1-0d1729e6a3e3.png)

cc ``@jsha``
r? ``@notriddle``
@GuillaumeGomez
Rollup merge of rust-lang#99817 - notriddle:notriddle/clean-trait-rem…
22444d6 
…oval, r=GuillaumeGomez

rustdoc: remove Clean trait impls for more items

Follow up to rust-lang#99638 and rust-lang#99672
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 27, 2022
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Jul 27, 2022

📌 Commit 22444d6 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 27, 2022
@bors
Copy link
Contributor

bors commented Jul 27, 2022

⌛ Testing commit 22444d6 with merge fce4581804b0bcf0de11a3963376e27477871bf1...

@bors
Copy link
Contributor

bors commented Jul 27, 2022

💔 Test failed - checks-actions

@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 Jul 27, 2022
@GuillaumeGomez
Copy link
Member Author

Doesn't seem related to the PRs in here. Just in case:

@bors retry

@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 Jul 27, 2022
@bors
Copy link
Contributor

bors commented Jul 28, 2022

⌛ Testing commit 22444d6 with merge f19caec2eda372f0128e093b2cdd7d08e9b329ed...

@rust-log-analyzer
Copy link
Collaborator

The job i686-msvc-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
#####################                                                     30.5%
###########################################################               82.7%
######################################################################## 100.0%
Traceback (most recent call last):
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    found:    07946445625d74b7f8c0ddc07870b8da921ce186b781853b6c07112b7561ba5d
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 2/5:
D:\a\rust\rust\src\bootstrap\bootstrap.py:5: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  import distutils.version
---
######################################################################## 100.0%
Traceback (most recent call last):
invalid checksum:
    found:    07946445625d74b7f8c0ddc07870b8da921ce186b781853b6c07112b7561ba5d
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 3/5:
D:\a\rust\rust\src\bootstrap\bootstrap.py:5: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  import distutils.version
  import distutils.version
downloading https://static.rust-lang.org/dist/2022-07-16/rust-std-beta-i686-pc-windows-msvc.tar.xz

##############                                                            19.7%
######################################################################## 100.0%
Traceback (most recent call last):
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    found:    07946445625d74b7f8c0ddc07870b8da921ce186b781853b6c07112b7561ba5d
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 4/5:
D:\a\rust\rust\src\bootstrap\bootstrap.py:5: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  import distutils.version
  import distutils.version
downloading https://static.rust-lang.org/dist/2022-07-16/rust-std-beta-i686-pc-windows-msvc.tar.xz

###################                                                       27.4%
######################################################################## 100.0%
Traceback (most recent call last):
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    found:    07946445625d74b7f8c0ddc07870b8da921ce186b781853b6c07112b7561ba5d
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 5/5:
D:\a\rust\rust\src\bootstrap\bootstrap.py:5: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  import distutils.version
  import distutils.version
downloading https://static.rust-lang.org/dist/2022-07-16/rust-std-beta-i686-pc-windows-msvc.tar.xz

##############                                                            20.5%
######################################################################## 100.0%
Traceback (most recent call last):
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    found:    07946445625d74b7f8c0ddc07870b8da921ce186b781853b6c07112b7561ba5d
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
The command has failed after 5 attempts.

@bors
Copy link
Contributor

bors commented Jul 28, 2022

💔 Test failed - checks-actions

@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 Jul 28, 2022
@rust-log-analyzer
Copy link
Collaborator

The job dist-i686-msvc failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
######################################                                    53.7%
######################################################################## 100.0%
Traceback (most recent call last):
invalid checksum:
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 2/5:
D:\a\rust\rust\src\bootstrap\bootstrap.py:5: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  import distutils.version
  import distutils.version
downloading https://static.rust-lang.org/dist/2022-07-16/rust-std-beta-i686-pc-windows-msvc.tar.xz

                                                                           0.4%
#######################################################                   76.9%
######################################################################## 100.0%
Traceback (most recent call last):
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    found:    07946445625d74b7f8c0ddc07870b8da921ce186b781853b6c07112b7561ba5d
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 3/5:
D:\a\rust\rust\src\bootstrap\bootstrap.py:5: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  import distutils.version
  import distutils.version
downloading https://static.rust-lang.org/dist/2022-07-16/rust-std-beta-i686-pc-windows-msvc.tar.xz

###############                                                           21.9%
######################################################################## 100.0%
Traceback (most recent call last):
invalid checksum:
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 4/5:
D:\a\rust\rust\src\bootstrap\bootstrap.py:5: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  import distutils.version
  import distutils.version
downloading https://static.rust-lang.org/dist/2022-07-16/rust-std-beta-i686-pc-windows-msvc.tar.xz

################                                                          23.2%
######################################################################## 100.0%
Traceback (most recent call last):
invalid checksum:
    found:    07946445625d74b7f8c0ddc07870b8da921ce186b781853b6c07112b7561ba5d
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 5/5:
D:\a\rust\rust\src\bootstrap\bootstrap.py:5: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives
  import distutils.version
  import distutils.version
downloading https://static.rust-lang.org/dist/2022-07-16/rust-std-beta-i686-pc-windows-msvc.tar.xz

                                                                           1.4%
######################################################################## 100.0%
Traceback (most recent call last):
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 943, in <module>
    found:    07946445625d74b7f8c0ddc07870b8da921ce186b781853b6c07112b7561ba5d
    expected: 35b4504603903e7c753487585fcc75237f4f8a0ee933c52941abaf2c6913e0f0
    main()
    main()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 926, in main
    bootstrap(help_triggered)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 901, in bootstrap
    build.download_toolchain()
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 433, in download_toolchain
    self._download_component_helper(filename, pattern, tarball_suffix)
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 464, in _download_component_helper
    get(
  File "D:\a\rust\rust\src\bootstrap\bootstrap.py", line 52, in get
    raise RuntimeError("failed verification")
make: *** [Makefile:58: prepare] Error 1
The command has failed after 5 attempts.

@GuillaumeGomez GuillaumeGomez deleted the rollup-ifyvhho branch July 28, 2022 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@GuillaumeGomez @bors @rust-log-analyzer @rustbot @belovdv @JohnTitor @dvdhrm @bstrie @notriddle