Rollup of 9 pull requests by matthiaskrgr · Pull Request #100809 · rust-lang/rust

matthiaskrgr · 2022-08-20T17:32:15Z

Successful merges:

Initial implementation of REUSE #99415 (Initial implementation of REUSE)
Expose Utf8Lossy as Utf8Chunks #99544 (Expose Utf8Lossy as Utf8Chunks)
Fix trailing space showing up in example #100585 (Fix trailing space showing up in example)
Remove unnecessary stderr files #100596 (Remove unnecessary stderr files)
Update fortanix-sgx-abi and export some useful SGX usercall traits #100642 (Update fortanix-sgx-abi and export some useful SGX usercall traits)
Make same_type_modulo_infer a proper TypeRelation #100691 (Make same_type_modulo_infer a proper TypeRelation)
Add LLVM15-specific codegen test for try/?s that now optimize away #100693 (Add LLVM15-specific codegen test for try/?s that now optimize away)
Windows: Load synch functions together #100710 (Windows: Load synch functions together)
Add TaKO8Ki to translation-related mention groups #100807 (Add TaKO8Ki to translation-related mention groups)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

The current text is rendered as: U+005B ..= U+0060 ``[ \ ] ^ _ ` ``, or. This patch changes that to render as: U+005B ..= U+0060 `` [ \ ] ^ _ ` ``, or The reason for that, is that CommonMark has a solution for starting or ending inline code with a backtick/grave accent: padding both sides with a space, makes that padding disappear.

Update fortanix-sgx-abi to 0.5.0 to add support for cancel queue (see fortanix/rust-sgx#405 and fortanix/rust-sgx#404). Export some useful traits for processing SGX usercall. This is needed for fortanix/rust-sgx#404 to avoid duplication.

These still generated a bunch of code back in Rust 1.63 (<https://rust.godbolt.org/z/z31P8h6rz>), but with LLVM 15 merged they no longer do 🎉

Attempt to load all the required sync functions and fail if any one of them fails. This reintroduces a macro for optional loading of functions but keeps it separate from the fallback macro rather than having that do two different jobs.

Co-Authored-By: Angus Lees <gus@inodes.org> Co-Authored-By: Fabian Grünbichler <f.gruenbichler@proxmox.com> Co-Authored-By: Hiroaki Nakamura <hnakamur@gmail.com> Co-Authored-By: Jordan Justen <jljusten@gmail.com> Co-Authored-By: Luca Bruno <lucab@debian.org> Co-Authored-By: Sylvestre Ledru <sylvestre@debian.org> Co-Authored-By: Ximin Luo <infinity0@debian.org>

…Simulacrum Initial implementation of REUSE This PR implements the first two steps of rust-lang#99414 by: * Adding some scaffolding for REUSE. The `.reuse/dep5` file now marks every file as the custom "TODO" license, which I'll remove in a future PR once Debian imports their metadata. The TODO license is needed so that `reuse lint` works. * Runs `reuse lint` in CI, in the `mingw-check` builder. REUSE currently has a bug when parsing some files in the LLVM source code. This means REUSE will fail when running it in source tarballs of rustc, and that bug prevents us from passing the `--include-submodules` flag in CI. I opened fsfe/reuse-tool#560 upstream with a fix, and as soon as it's merged/released I planned to bump the pinned version to include the fix we need. r? `@Mark-Simulacrum`

…lacrum Expose `Utf8Lossy` as `Utf8Chunks` This PR changes the feature for `Utf8Lossy` from `str_internals` to `utf8_lossy` and improves the API. This is done to eventually expose the API as stable. Proposal: rust-lang/libs-team#54 Tracking Issue: rust-lang#99543

Fix trailing space showing up in example The current text is rendered as: U+005B ..= U+0060 ``[ \ ] ^ _ ` ``, or (**note the final space!**) This patch changes that to render as: U+005B ..= U+0060 `` [ \ ] ^ _ ` ``, or (**note no final space!**) The reason for that, is that CommonMark has a solution for starting or ending inline code with a backtick/grave accent: padding both sides with a space, makes that padding disappear.

…files, r=Mark-Simulacrum Remove unnecessary stderr files This patch removes stderr files corresponding to revisions that have already been removed.

…queue, r=Mark-Simulacrum Update fortanix-sgx-abi and export some useful SGX usercall traits Update `fortanix-sgx-abi` to 0.5.0 to add support for cancel queue (see fortanix/rust-sgx#405 and fortanix/rust-sgx#404). Export some useful traits for processing SGX usercall. This is needed for fortanix/rust-sgx#404 to avoid duplication. cc `@raoulstrackx` and `@jethrogb`

…tebank Make `same_type_modulo_infer` a proper `TypeRelation` Specifically, this fixesrust-lang#100690 because we no longer consider a `ReLateBound` and a `ReVar` to be equal. `ReVar` can only be equal to free regions or static.

…imulacrum Add LLVM15-specific codegen test for `try`/`?`s that now optimize away These still generated a bunch of code back in Rust 1.63 (<https://rust.godbolt.org/z/z31P8h6rz>), but with LLVM 15 merged they no longer do 🎉

Windows: Load synch functions together Attempt to load all the required sync functions and fail if any one of them fails. This fixes a FIXME by going back to optional loading of `WakeByAddressSingle`. Also reintroduces a macro for optional loading of functions but keeps it separate from the fallback macro rather than having that do two different jobs. r? `@thomcc`

…-related-mention-groups, r=Mark-Simulacrum Add TaKO8Ki to translation-related mention groups Can I join translation-related mention groups? cc `@davidtwco`

matthiaskrgr · 2022-08-20T17:32:34Z

@bors r+ rollup=never p=10

bors · 2022-08-20T17:32:35Z

📌 Commit 0be0819 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-08-20T17:38:32Z

⌛ Testing commit 0be0819 with merge 48853a3...

bors · 2022-08-20T20:08:20Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 48853a3 to master...

rust-timer · 2022-08-20T20:11:08Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#100807	797d05c24d988ed165dd48cda55ed28aa77207a5
#100710	e27bfeae5d0c72a3d265a20cd7891448d5fd1981
#100693	732405c57552ba0fdc8b174b688b7da9584e3cac
#100691	7adfd3189b90b860f967b02a9c95ae92195bdc8f
#100642	cdcb79157addf0bca8008e55d4373617e7f5121b
#100596	9de03e9fd8f9098db383bab4b77115071f4fcc86
#100585	423265b67ba272b573892d0366816aa764d7ba59
#99544	dae1798f5191bba0123a12a33e2fd5fa9b321764
#99415	7c6811902ce3f5d6fefb7f727a1c589457801150

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2022-08-20T21:24:16Z

Finished benchmarking commit (48853a3): comparison url.

Instruction count

Primary benchmarks: ✅ relevant improvement found
Secondary benchmarks: ✅ relevant improvement found

	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.0%	-1.0%	1
Improvements ✅ (secondary)	-0.3%	-0.3%	1
All ❌✅ (primary)	-1.0%	-1.0%	1

Max RSS (memory usage)

Results

Primary benchmarks: ❌ relevant regressions found
Secondary benchmarks: ❌ relevant regressions found

	mean¹	max	count²
Regressions ❌ (primary)	2.5%	2.6%	2
Regressions ❌ (secondary)	1.9%	2.3%	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.5%	2.6%	2

Cycles

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

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change↩↩²
number of relevant changes↩↩²

emilyalbiniand others added 24 commits July 18, 2022 12:05

add basic REUSE scaffolding
f74d5c1

check REUSE compliance in CI
9369e60

remove unnecessary stderr files
03db919

Make same_type_modulo_infer a proper TypeRelation
64bd8c1

Add LLVM15-specific codegen test for try/?s that now optimize away
5145c97
These still generated a bunch of code back in Rust 1.63 (<https://rust.godbolt.org/z/z31P8h6rz>), but with LLVM 15 merged they no longer do 🎉

Windows: Load synch functions together
b631ca0
Attempt to load all the required sync functions and fail if any one of them fails. This reintroduces a macro for optional loading of functions but keeps it separate from the fallback macro rather than having that do two different jobs.

cleanup .reuse/dep5
a0c08c6

import license changes
00c8306

Simplify load/store
efd305e

Use const instead of static
625e7e9

add TaKO8Ki to translation-related mention groups
ebeb77e

Expose Utf8Lossy as Utf8Chunks
e8ee0b7

Rollup merge ofrust-lang#100596- TaKO8Ki:remove-unnecessary-stderr-…
23a603a
…files, r=Mark-Simulacrum Remove unnecessary stderr files This patch removes stderr files corresponding to revisions that have already been removed.

Rollup merge ofrust-lang#100807- TaKO8Ki:add-tako8ki-to-translation…
0be0819
…-related-mention-groups, r=Mark-Simulacrum Add TaKO8Ki to translation-related mention groups Can I join translation-related mention groups? cc `@davidtwco`

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 20, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 20, 2022

bors merged commit 48853a3 into rust-lang:masterAug 20, 2022

rustbot added this to the 1.65.0 milestone Aug 20, 2022

bors mentioned this pull request Aug 20, 2022
Add slice methods for indexing via an array of indices. #83608
Merged

bors mentioned this pull request Aug 20, 2022
Reduce CString allocations in std as much as possible #93668
Merged

matthiaskrgr deleted the rollup-xkpd5ii branch October 9, 2022 00:31

Navigation Menu

Uh oh!

Uh oh!

Rollup of 9 pull requests - #100809

Rollup of 9 pull requests#100809
bors merged 24 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-xkpd5ii

matthiaskrgr commented Aug 20, 2022

Uh oh!

matthiaskrgr commented Aug 20, 2022

Uh oh!

bors commented Aug 20, 2022

Uh oh!

bors commented Aug 20, 2022

Uh oh!

bors commented Aug 20, 2022

Uh oh!

rust-timer commented Aug 20, 2022

Uh oh!

rust-timer commented Aug 20, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Aug 20, 2022

Uh oh!

matthiaskrgr commented Aug 20, 2022

Uh oh!

bors commented Aug 20, 2022

Uh oh!

bors commented Aug 20, 2022

Uh oh!

bors commented Aug 20, 2022

Uh oh!

rust-timer commented Aug 20, 2022

Uh oh!

rust-timer commented Aug 20, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants