Skip to content

Rollup of 6 pull requests - #96130

Closed
Dylan-DPC wants to merge 13 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-1tu8r8g
Closed

Rollup of 6 pull requests#96130
Dylan-DPC wants to merge 13 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-1tu8r8g

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

MabezDevand others added 13 commits April 11, 2022 10:50
* corect type usage with new type definitions in libc
In particular, this makes the output of `x build -vv` easier to read.
Before:
```
c Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
```
After:
```
c Sysroot { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu } }
```
Use `multipart_suggestion` and don't suggested unnecessary parenthesis.
Use `multipart_suggestion` instead of getting a snippet.
…ark-Simulacrum
espidf: fix stat
Marking as draft as currently dependant on [a libc fix](rust-lang/libc#2708) and release.
…e, r=GuillaumeGomez
htmldocck: Compare HTML tree instead of plain text html
This PR improves `htmldocck` by comparing HTML trees instead of plain text html in the case of doing a ``@snapshot`` test.
This fix the [CI issue](https://github.com/rust-lang-ci/rust/runs/5964305020?check_suite_focus=true) encounter in rust-lang#95813 where for some unknown reason one of the attributes is not always at the same place.
The code is largely based on https://github.com/formencode/formencode/blob/3a1ba9de2fdd494dd945510a4568a3afeddb0b2e/formencode/doctest_xml_compare.py#L72-L120 which is behind MIT License. The comparison function is straightforward except for the `text_compare` function which does some weird stuff that we may want to simply reduce to a plain old comparison.
r? `@GuillaumeGomez`
…-Simulacrum
Make the debug output for `TargetSelection` less verbose
In particular, this makes the output of `x build -vv` easier to read.
Before:
```
c Sysroot { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } }
```
After:
```
c Sysroot { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu } }
```
…vements, r=nagisa
Strict provenance lint diagnostics improvements
Use `multipart_suggestion` instead of `span_suggestion` and getting a snippet for the expression. Also don't suggest unnecessary parenthesis in `lossy_provenance_casts`.
cc `@estebank`
`@rustbot` label A-diagnostics
to_digit tweak
No need to check the assert all the time.
(Checked the TODO and it's not time to get rid of it yet)
@rustbotrustbot 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 Apr 16, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Apr 16, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit b45a233 has been approved by Dylan-DPC

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

bors commented Apr 16, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b45a233 with merge 68b8dd367aa1f4adbd93a4c8f532866b58b416a3...

@bors

bors commented Apr 16, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 16, 2022
@Dylan-DPCDylan-DPC mentioned this pull request Apr 16, 2022
@Dylan-DPC
Dylan-DPC deleted the rollup-1tu8r8g branch April 16, 2022 22:06
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
 Memory: 14 GB
System Firmware Version: VMW71.00V.13989454.B64.1906190538
Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
SMC Version (system): 2.8f0
Serial Number (system): VMFWbEUgByxp
Provisioning UDID: 4203018E-580F-C1B5-9525-B745CECA79EB
hw.ncpu: 3
hw.byteorder: 1234
---
hw.tbfrequency: 1000000000
hw.use_kernelmanagerd: 1
Building rustbuild
Finished dev [unoptimized] target(s) in 0.56s
[TIMING] Mingw { host: aarch64-apple-darwin } -- 0.000
[TIMING] Assemble { target_compiler: Compiler { stage: 0, host: x86_64-apple-darwin } } -- 0.000
[TIMING] StartupObjects { compiler: Compiler { stage: 0, host: x86_64-apple-darwin }, target: x86_64-apple-darwin } -- 0.000
[TIMING] Sysroot { compiler: Compiler { stage: 0, host: x86_64-apple-darwin } } -- 0.001
[TIMING] Libdir { compiler: Compiler { stage: 0, host: x86_64-apple-darwin }, target: x86_64-apple-darwin } -- 0.000
---
Compiling addr2line v0.16.0
[RUSTC-TIMING] addr2line test:false 1.090
[RUSTC-TIMING] gimli test:false 15.127
[RUSTC-TIMING] object test:false 12.579
error[E0412]: cannot find type `off64_t` in crate `libc`
--> library/std/src/sys/unix/fd.rs:112:33
112 | offset as libc::off64_t,
| ^^^^^^^ help: a type alias with a similar name exists: `off_t`
|
::: /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/libc-0.2.121/src/unix/bsd/mod.rs:1:1
::: /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/libc-0.2.121/src/unix/bsd/mod.rs:1:1
|
1 | pub type off_t = i64;
| --------------------- similarly named type alias `off_t` defined here
error[E0412]: cannot find type `off64_t` in crate `libc`
--> library/std/src/sys/unix/fd.rs:179:33
179 | offset as libc::off64_t,
| ^^^^^^^ help: a type alias with a similar name exists: `off_t`
|
::: /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/libc-0.2.121/src/unix/bsd/mod.rs:1:1
::: /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/libc-0.2.121/src/unix/bsd/mod.rs:1:1
|
1 | pub type off_t = i64;
| --------------------- similarly named type alias `off_t` defined here
error[E0412]: cannot find type `off64_t` in crate `libc`
|
|
969 | let n = cvt(unsafe { lseek64(self.as_raw_fd(), pos as libc::off64_t, whence) })?;
| ^^^^^^^ help: a type alias with a similar name exists: `off_t`
::: /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/libc-0.2.121/src/unix/bsd/mod.rs:1:1
|
1 | pub type off_t = i64;
1 | pub type off_t = i64;
| --------------------- similarly named type alias `off_t` defined here
For more information about this error, try `rustc --explain E0412`.
[RUSTC-TIMING] std test:false 3.502
error: could not compile `std` due to 3 previous errors
Build completed unsuccessfully in 0:01:25

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@Dylan-DPC@bors@rust-log-analyzer@rustbot@MabezDev@jyn514@niluxv@RalfJung@Urgau@gilescope