Rollup of 9 pull requests by Dylan-DPC · Pull Request #96063 · rust-lang/rust

Dylan-DPC · 2022-04-15T00:55:06Z

Successful merges:

Stabilize derive_default_enum #94457 (Stabilize derive_default_enum)
Reject #[thread_local] attribute on non-static items #95006 (Reject #[thread_local] attribute on non-static items)
remove find_use_placement #95194 (remove find_use_placement)
Improve diagnostics for unterminated nested block comment #95859 (Improve diagnostics for unterminated nested block comment)
Consider lifetimes when comparing types for equality in MIR validator #96004 (Consider lifetimes when comparing types for equality in MIR validator)
Update books #96032 (Update books)
docs: add link from zip to unzip #96038 (docs: add link from zip to unzip)
Use u32 instead of i32 for futexes. #96040 (Use u32 instead of i32 for futexes.)
Remove some now-dead code that was only relevant before deaggregation. #96050 (Remove some now-dead code that was only relevant before deaggregation.)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

A more robust solution to finding where to place use suggestions was added. The algorithm uses the AST to find the span for the suggestion so we pass this span down to the HIR during lowering and use it. Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>

The docs for `Iterator::unzip` explain that it is kind of an inverse operation to `Iterator::zip` and guide the reader to the `zip` docs, but the `zip` docs don't let the user know that they can undo the `zip` operation with `unzip`. This change modifies the docs to help the user find `unzip`.

Co-authored-by: Mara Bos <m-ou.se@m-ou.se>

The code was broken anyway, if the deaggregator is disabled, it would have ICE on any non-enum Adt

…um, r=davidtwco Stabilize `derive_default_enum` This stabilizes `#![feature(derive_default_enum)]`, as proposed in [RFC 3107](rust-lang/rfcs#3107) and tracked in rust-lang#87517. In short, it permits you to `#[derive(Default)]` on `enum`s, indicating what the default should be by placing a `#[default]` attribute on the desired variant (which must be a unit variant in the interest of forward compatibility). `````@rustbot````` label +S-waiting-on-review +T-lang

…eywiser Reject `#[thread_local]` attribute on non-static items

…cement, r=pnkfelix remove find_use_placement A more robust solution to finding where to place use suggestions was added in rust-lang#94584. The algorithm uses the AST to find the span for the suggestion so we pass this span down to the HIR during lowering and use it instead of calling `find_use_placement` Fixes rust-lang#94941

…comment, r=petrochenkov Improve diagnostics for unterminated nested block comment close rust-lang#95283 (This is my first time try to messing around with rust compiler and might get a lot of things wrong... 🙇 )

…rochenkov Consider lifetimes when comparing types for equality in MIR validator Closes rust-lang#95978 .

Update books ## nomicon 1 commits in 11f1165e8a2f5840467e748c8108dc53c948ee9a..c7d8467ca9158da58ef295ae65dbf00a308752d9 2022-03-19 16:02:00 -0400 to 2022-04-06 14:26:54 +0900 - Change "writers" to "readers" for Deref. (rust-lang/nomicon#346) ## reference 7 commits in c97d14fa6fed0baa9255432b8a93cb70614f80e3..b5f6c2362baf932db9440fbfcb509b309237ee85 2022-03-19 18:18:10 -0700 to 2022-04-10 19:19:51 -0700 - Fix typo: `?` should be inside `<sup>` tags (rust-lang/reference#1190) - Update aarch64 to use neon as fp (rust-lang/reference#1184) - Boolean literal expressions (rust-lang/reference#1189) - Document that unary negation of a signed integer literal cannot cause an overflow error (rust-lang/reference#1188) - Document compatibility between declarative and procedural macro tokens (rust-lang/reference#1169) - Document native library modifier syntax and the `whole-archive` modifier specifically (rust-lang/reference#1170) - Numeric literal expressions and literal suffixes (rust-lang/reference#1177) ## book 8 commits in ea90bbaf53ba64ef4e2da9ac2352b298aec6bec8..765318b844569a642ceef7bf1adab9639cbf6af3 2022-03-28 21:59:34 -0400 to 2022-04-12 21:14:47 -0400 - Propagate nostarch edits to src - Propagate updated test example code to nostarch snapshot - Edits to nostarch edits - edits from nostarch - Fix error message for the example code - update ch13-02 to reflect changes in rust-lang/book#2797 - Update to 1.59 - Edits to chapter 2 after tech review ## rust-by-example 4 commits in ec954f35eedf592cd173b21c05a7f80a65b61d8a..c2a98d9fc5d29c481d42052fbeccfde15ed03116 2022-03-22 11:09:06 -0300 to 2022-04-08 06:44:18 -0300 - Code highlight a variable (rust-lang/rust-by-example#1530) - Add a comment to note that warnings may not be shown in a browser in the Variable Bindings section (rust-lang/rust-by-example#1529) - Make all new types have UpperCamelCase names in code example in the Aliasing section (rust-lang/rust-by-example#1528) - Replace `C` with C/C++ (rust-lang/rust-by-example#1527) ## rustc-dev-guide 6 commits in 155126b..eeb5a83 2022-03-22 14:34:21 +0100 to 2022-04-11 23:29:48 +0900 - method-lookup.md improvements (rust-lang/rustc-dev-guide#1296) - Consolidate crates.io convention section (rust-lang/rustc-dev-guide#1326) - Update examples with 1.61.0-nightly (latest version) (rust-lang/rustc-dev-guide#1330) - r-a: Use `python3 x.py` instead of `./x.py` (rust-lang/rustc-dev-guide#1335) - Update miri.md: correct a minor typo (rust-lang/rustc-dev-guide#1334) - Add example how lints can be feature gated

docs: add link from zip to unzip The docs for `Iterator::unzip` explain that it is kind of an inverse operation to `Iterator::zip` and guide the reader to the `zip` docs, but the `zip` docs don't let the user know that they can undo the `zip` operation with `unzip`. This change modifies the docs to help the user find `unzip`.

Use u32 instead of i32 for futexes. This changes futexes from i32 to u32. The [Linux man page](https://man7.org/linux/man-pages/man2/futex.2.html) uses `uint32_t` for them, so I'm not sure why I used i32 for them. Maybe because I first used them for thread parkers, where I used -1, 0, and 1 as the states. (Wasm's `memory.atomic.wait32` does use `i32`, because wasm doesn't support `u32`.) It doesn't matter much, but using the unsigned type probably results in fewer surprises when shifting bits around or using comparison operators. r? ``@Amanieu``

…fJung Remove some now-dead code that was only relevant before deaggregation. The code was broken anyway, if the deaggregator is disabled, it would have ICEd on any non-enum Adt r? `@RalfJung`

Dylan-DPC · 2022-04-15T00:55:22Z

@bors r+ rollup=never p=5

bors · 2022-04-15T00:55:23Z

📌 Commit a024036 has been approved by Dylan-DPC

bors · 2022-04-15T01:10:00Z

⌛ Testing commit a024036 with merge f924b85969def8d8735b288e48c63dd3a6b30086...

bors · 2022-04-15T05:25:01Z

💥 Test timed out

Dylan-DPC · 2022-04-15T05:44:33Z

@bors retry

bors · 2022-04-15T05:44:46Z

⌛ Testing commit a024036 with merge c287288673b56140b0883dd24daa80594c3f0c3d...

bors · 2022-04-15T06:30:17Z

💔 Test failed - checks-actions

Dylan-DPC · 2022-04-15T06:32:36Z

@bors retry

bors · 2022-04-15T06:33:05Z

⌛ Testing commit a024036 with merge 2d8fd70d3c2c197a33b3415087fbfee88f682a04...

rust-log-analyzer · 2022-04-15T06:33:34Z

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)

---- [ui] src/test\ui-fulldeps\stdio-from.rs stdout ----

error: test run failed!
status: exit code: 101
command: PATH="D:\a\rust\rust\build\i686-pc-windows-msvc\stage2\lib\rustlib\i686-pc-windows-msvc\lib;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x86;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0-bootstrap-tools\i686-pc-windows-msvc\release\deps;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0\bin;D:\a\rust\rust\ninja;D:\a\rust\rust\msys2\mingw32\bin;C:\hostedtoolcache\windows\Python\3.10.4\x64\Scripts;C:\hostedtoolcache\windows\Python\3.10.4\x64;C:\msys64\usr\bin;D:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.7.5\x64;C:\cabal\bin;C:\ghcup\bin;C:\tools\ghc-9.2.2\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.1.3\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\hostedtoolcache\windows\go\1.17.8\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.322-6\x64\bin;C:\npm\prefix;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\Docker;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files\nodejs;C:\Program Files\OpenSSL\bin;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.5\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\ui-fulldeps\\stdio-from\\a.exe"
stdout: none
--- stderr -------------------------------
I/O error: operation failed to complete synchronously
thread 'main' panicked at 'assertion failed: child2.wait()?.success()', D:\a\rust\rust\src/test\ui-fulldeps\stdio-from.rs:50:5
------------------------------------------




failures:
    [ui] src/test\ui-fulldeps\stdio-from.rs

test result: FAILED. 65 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out; finished in 29.02s

Some tests failed in compiletest suite=ui-fulldeps mode=ui host=i686-pc-windows-msvc target=i686-pc-windows-msvc
Build completed unsuccessfully in 0:39:13
make: *** [Makefile:72: ci-subset-1] Error 1
---
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version
git version 2.35.1.windows.2
Copying 'C:\Users\runneradmin\.gitconfig' to 'D:\a\_temp\b75d1e65-47da-452b-b82b-7673d6bd8b10\.gitconfig'
Temporarily overriding HOME='D:\a\_temp\b75d1e65-47da-452b-b82b-7673d6bd8b10' before making global git config changes
[command]"C:\Program Files\Git\bin\git.exe" config --global --add safe.directory D:\a\rust\rust
[command]"C:\Program Files\Git\bin\git.exe" config --local --name-only --get-regexp core\.sshCommand
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :"
Entering 'library/backtrace'

bors · 2022-04-15T10:48:05Z

💥 Test timed out

rust-log-analyzer · 2022-04-15T14:09:28Z

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

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

rust-log-analyzer · 2022-04-15T14:18:07Z

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

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

tmiasko and others added 21 commits March 16, 2022 13:00

Reject #[thread_local] attribute on non-static items

5e76103

remove find_use_placement

8c2353b

A more robust solution to finding where to place use suggestions was added. The algorithm uses the AST to find the span for the suggestion so we pass this span down to the HIR during lowering and use it. Signed-off-by: Miguel Guarniz <mi9uel9@gmail.com>

Stabilize derive_default_enum

abf2b4c

Add documentation

a3dd654

Consider lifetimes when comparing types for equality in MIR validator

d5f3863

improve diagnostics for unterminated nested block comment

4a0f8d5

Update books

849ede1

Remove trailing whitespace

d73e328

Co-authored-by: Mara Bos <m-ou.se@m-ou.se>

Use u32 instead of i32 for futexes.

7a35c0f

refactor: change to use peekable

1b7008d

Remove some now-dead code that was only relevant before deaggregation.

48029ab

The code was broken anyway, if the deaggregator is disabled, it would have ICE on any non-enum Adt

Rollup merge of rust-lang#95006 - tmiasko:thread-local-static, r=wesl…

c149fec

…eywiser Reject `#[thread_local]` attribute on non-static items

Rollup merge of rust-lang#96004 - JakobDegen:fix-validator-ice, r=pet…

89dd3bf

…rochenkov Consider lifetimes when comparing types for equality in MIR validator Closes rust-lang#95978 .

Rollup merge of rust-lang#96050 - oli-obk:deaggregator_cleanup, r=Ral…

a024036

…fJung Remove some now-dead code that was only relevant before deaggregation. The code was broken anyway, if the deaggregator is disabled, it would have ICEd on any non-enum Adt r? `@RalfJung`

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

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 Apr 15, 2022

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 Apr 15, 2022

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 Apr 15, 2022

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 Apr 15, 2022

bors mentioned this pull request Apr 15, 2022

fix error handling for pthread_sigmask(3) #93530

Merged

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 Apr 15, 2022

Dylan-DPC closed this Apr 17, 2022

Dylan-DPC deleted the rollup-4i2dkip branch April 17, 2022 06:43

Uh oh!

Conversation

Dylan-DPC commented Apr 15, 2022

Uh oh!

Dylan-DPC commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

Dylan-DPC commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

Dylan-DPC commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

rust-log-analyzer commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

rust-log-analyzer commented Apr 15, 2022

Uh oh!

rust-log-analyzer commented Apr 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants