Rollup of 12 pull requests#77224

RalfJung · 2020-09-26T10:58:36Z

Successful merges:

Explicitly document the size guarantees that Option makes. #75454 (Explicitly document the size guarantees that Option makes.)
Add x.py setup #76631 (Add x.py setup)
Add missing code examples on slice iter types #77076 (Add missing code examples on slice iter types)
merge need_type_info_err(_const) #77093 (merge need_type_info_err(_const))
Add #![feature(const_fn_floating_point_arithmetic)] #77122 (Add #![feature(const_fn_floating_point_arithmetic)])
Update mdBook #77127 (Update mdBook)
Remove TrustedLen requirement from BuilderMethods::switch #77161 (Remove TrustedLen requirement from BuilderMethods::switch)
update Miri #77166 (update Miri)
Add doc alias for pointer primitive #77181 (Add doc alias for pointer primitive)
Remove stray word from ClosureKind::extends docs #77204 (Remove stray word from ClosureKind::extends docs)
Rename whence to span #77207 (Rename whence to span)
Remove unused #[allow(...)] statements from compiler/ #77211 (Remove unused #[allow(...)] statements from compiler/)

Failed merges:

Remove #[rustc_allow_const_fn_ptr] and add #![feature(const_fn_fn_ptr_basics)] #77170 (Remove #[rustc_allow_const_fn_ptr] and add #![feature(const_fn_fn_ptr_basics)])

Triggered by a discussion on wg-unsafe-code-guidelines about which layouts of `Option<T>` one can guarantee are optimised to a single pointer.

Co-authored-by: Ralf Jung <post@ralfj.de>

0.4.2 -> 0.4.3

- Suggest `x.py setup` if config.toml doesn't exist yet (twice, once before and once after the build) - Prompt for a profile if not given on the command line - Print the configuration file that will be used - Print helpful starting commands after setup - Link to the dev-guide after finishing - Note that distro maintainers will see the changelog warning

The main use case of TrustedLen is allowing APIs to specialize on it, but no use of it uses that specialization. Instead, only the .len() function provided by ExactSizeIterator is used, which is already required to be accurate. Thus, the TrustedLen requirement on BuilderMethods::switch is redundant.

This refactors handling of `Rvalue::{Unary,Binary}Op` in the const-checker. Now we `span_bug` if there's an unexpected type in a primitive operation. This also allows unary negation on `char` values through the const-checker because it makes the code a bit cleaner. `char` does not actually support these operations, and if it did, we could evaluate them at compile-time.

It's called `span` elsewhere in the compiler and `span` is also less surprising. `whence` is whimsical, but not super clear :)

@jyn514

Rename `whence` to `span` It's called `span` elsewhere in the compiler and `span` is also less surprising. `whence` is whimsical, but not super clear :) See [this Discord conversation](https://discord.com/channels/442252698964721669/459149231702278154/758731658689511444) for more. r? @jyn514

Remove unused #[allow(...)] statements from compiler/

RalfJung · 2020-09-26T10:59:01Z

@rustbot modify labels: +rollup
@bors r+ rollup=never p=12

bors · 2020-09-26T10:59:02Z

📌 Commit 9e02642 has been approved by RalfJung

bors · 2020-09-26T12:20:07Z

⌛ Testing commit 9e02642 with merge 7351b7f2e5ff5dfdaf71d9fcf728610d35262bff...

bors · 2020-09-26T16:35:07Z

💥 Test timed out

rust-log-analyzer · 2020-09-26T17:24:11Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

##[group]Run exit 1
exit 1
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
##[endgroup]
##[error]Process completed with exit code 1.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

RalfJung · 2020-09-26T17:33:37Z

@bors retry

bors · 2020-09-26T17:50:33Z

⌛ Testing commit 9e02642 with merge e37c99f...

bors · 2020-09-26T19:52:45Z

☀️ Test successful - checks-actions, checks-azure
Approved by: RalfJung
Pushing e37c99f to master...

rust-highfive · 2020-09-26T19:53:48Z

📣 Toolstate changed by #77224!

Tested on commit e37c99f.
Direct link to PR: #77224

🎉 miri on windows: test-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: test-fail → test-pass (cc @oli-obk @eddyb @RalfJung).

@oli-obk

Tested on commit rust-lang/rust@e37c99f. Direct link to PR: <rust-lang/rust#77224> 🎉 miri on windows: test-fail → test-pass (cc @oli-obk @eddyb @RalfJung). 🎉 miri on linux: test-fail → test-pass (cc @oli-obk @eddyb @RalfJung).

ltratt and others added 30 commits August 12, 2020 15:07

Explicitly document the size guarantees that Option makes.

73ada2d

Triggered by a discussion on wg-unsafe-code-guidelines about which layouts of `Option<T>` one can guarantee are optimised to a single pointer.

Clarify and add guarantee about transmute.

f5118a5

Be clear about the reverse transmute guarantees.

83f47aa

Be clearer about Some/None transmute.

f3d7196

Change notation.

8cb8955

Co-authored-by: Ralf Jung <post@ralfj.de>

Add Rust function pointers.

55802e3

Co-authored-by: Ralf Jung <post@ralfj.de>

Rename the types for clarity.

68209c3

Grammar tweak.

9bac577

merge need_type_info_err(_const)

45d92b4

unused path

0abb1ab

use the correct span when dealing with inference variables

3dbfdb0

use relevant span when unifying ConstVarValues

0e84b61

Update mdBook

945a732

0.4.2 -> 0.4.3

update Miri

47843f5

the two hardest things in programming, names and...

e5430e5

nit

ff7009a

Add const_fn_floating_point_arithmetic

0d2521a

Add new feature gate to standard library

6a52c09

Bless tests

b428f28

Move const fn floating point test out of min_const_fn

4cac90c

Use proper issue for const_fn_floating_point_arithmetic

659028f

Add missing code examples on slice iter types

187162e

Remove stray word from ClosureKind::extends docs

900daba

Rename whence to span

aa6a2f4

It's called `span` elsewhere in the compiler and `span` is also less surprising. `whence` is whimsical, but not super clear :)

Remove unused #[allow(...)] statements from compiler/

12187b7

rename functions

32195ac

unused into

9a607c0

RalfJung added 2 commits September 26, 2020 12:58

Rollup merge of rust-lang#77211 - est31:remove_unused_allow, r=oli-obk

9e02642

Remove unused #[allow(...)] statements from compiler/

rustbot added the rollup A PR which is a rollup label Sep 26, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 26, 2020

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 Sep 26, 2020

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 Sep 26, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 26, 2020

bors merged commit e37c99f into rust-lang:master Sep 26, 2020

rustbot added this to the 1.48.0 milestone Sep 26, 2020

RalfJung deleted the rollup-hdvb96c branch September 28, 2020 08:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 12 pull requests#77224