Skip to content

Rollup of 9 pull requests - #83547

Merged
bors merged 21 commits into
rust-lang:masterfrom
JohnTitor:rollup-qh7j6hg
Mar 27, 2021
Merged

Rollup of 9 pull requests#83547
bors merged 21 commits into
rust-lang:masterfrom
JohnTitor:rollup-qh7j6hg

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

JohnTitorand others added 21 commits March 18, 2021 05:59
Changelog: https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md#parking_lot_core-083-2021-02-12
The full log:
```
Removing cloudabi v0.1.0
Updating parking_lot v0.11.0 -> v0.11.1
Updating parking_lot_core v0.8.0 -> v0.8.3
```
Commit range: llogiq/bytecount@b0f5fba...8dcd437
The full log:
```
Updating bytecount v0.6.0 -> v0.6.2
Adding libm v0.1.4
Removing packed_simd v0.3.3
Adding packed_simd_2 v0.3.4
```
When building with multiple codegen units the test case can fail with
only a subset of all errors. Use a single codegen unit as a workaround.
This should be a nice small quality of life improvement when looking at
`config.toml.example` on GitHub or looking at diffs of it in PRs.
…acrum
Remove/replace some outdated crates from the dependency tree
- Remove `cloudabi` by updating `parking_lot` to 0.11.1.
- Replace `packed_simd` with `packed_simd2` by updating `bytecount` to 0.6.2.
Fixes to inline assmebly tests
* Join test thread to make assertion effective in sym.rs test case
* Use a single codegen unit to reduce non-determinism in srcloc.rs test rust-lang#82886
Simplify and fix byte skipping in format! string parser
Fixes '\\' handling in format strings.
Fixesrust-lang#83340
Make # pretty print format easier to discover
# Rationale:
I use (cargo cult?) three formats in rust: `{}`, debug `{:?}`, and pretty-print debug `{:#?}`. I discovered `{:#?}` in some blog post or guide when I started working in Rust. While `#` is documented I think it is hard to discover. So taking the good advice of ```@carols10cents``` I am trying to improve the docs with a PR
As a reminder "pretty print" means that where `{:?}` will print something like
```
foo: { b1: 1, b2: 2}
```
`{:#?}` will prints something like
```
foo {
b1: 1
b2: 3
}
```
# Changes
Add an example to `fmt` to try and make it easier to discover `#`
…s, r=Mark-Simulacrum
Tell GitHub to highlight `config.toml.example` as TOML
This should be a nice small quality of life improvement when looking at
`config.toml.example` on GitHub or looking at diffs of it in PRs.
…joshtriplett
Use the direct link to the platform support page
…=Mark-Simulacrum
compiletest: handle llvm_version with suffix like "12.0.0libcxx"
The previous code only remove the suffix begin with `-`, but Gentoo Linux [define `LLVM_VERSION_SUFFIX="libcxx"`](https://github.com/gentoo/gentoo/blob/604d79f327176eecb05293d7154e24231229cb31/sys-devel/llvm/llvm-11.1.0.ebuild#L378) when llvm is linked to libc++ and lead to a panic:
```
thread 'main' panicked at 'Malformed version component: ParseIntError { kind: InvalidDigit }', src/tools/compiletest/src/header.rs:968:28
```
This new code will handle all suffix not beginning with digit or dot.
…t, r=sfackler
Document that the SocketAddr memory representation is not stable
Intended to help out with rust-lang#78802. Work has been put into finding and fixing code that assumes the memory layout of `SocketAddrV4` and `SocketAddrV6`. But it turns out there are cases where new code continues to make the same assumption ([example](spacejam/seaslug@96927dc#diff-917db3d8ca6f862ebf42726b23c72a12b35e584e497ebdb24e474348d7c6ffb6R610-R621)).
The memory layout of a type in `std` is never part of the public API. Unless explicitly stated I guess. But since that is invalidly relied upon by a considerable amount of code for these particular types, it might make sense to explicitly document this. This can be temporary. Once rust-lang#78802 lands it does not make sense to rely on the layout any longer, and this documentation can also be removed.
@rustbotrustbot added the rollup A PR which is a rollup label Mar 27, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=9 rollup=never

@bors

bors commented Mar 27, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 1b01e0d has been approved by JohnTitor

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

bors commented Mar 27, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1b01e0d with merge b96912a3aeec63b83ba389d943fb1b75f7a7f786...

@bors

bors commented Mar 27, 2021

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@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 Mar 27, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors retry

@borsbors 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 Mar 27, 2021
@bors

bors commented Mar 27, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1b01e0d with merge feaac19...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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

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

@klensy

Copy link
Copy Markdown
Contributor

So there no time limit for one test to run? Like fail by timeout and run next tests.

@bors

bors commented Mar 27, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing feaac19 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 27, 2021
@bors
bors merged commit feaac19 into rust-lang:masterMar 27, 2021
@rustbotrustbot added this to the 1.53.0 milestone Mar 27, 2021
@JohnTitor
JohnTitor deleted the rollup-qh7j6hg branch March 27, 2021 10:53
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

12 participants

@JohnTitor@bors@rust-log-analyzer@klensy@rustbot@tmiasko@osa1@alamb@camelid@12101111@faern@lcnr