Rollup of 12 pull requests by jonas-schievink · Pull Request #78334 · rust-lang/rust

jonas-schievink · 2020-10-24T20:40:02Z

Successful merges:

#[deny(unsafe_op_in_unsafe_fn)] in sys/cloudabi #75115 (#[deny(unsafe_op_in_unsafe_fn)] in sys/cloudabi)
change the order of type arguments on ControlFlow #76614 (change the order of type arguments on ControlFlow)
revise Hermit's mutex interface to support the behaviour of StaticMutex #77610 (revise Hermit's mutex interface to support the behaviour of StaticMutex)
Simplify query proc-macros #77830 (Simplify query proc-macros)
Do not ICE with TraitPredicates containing [type error] #77930 (Do not ICE with TraitPredicates containing [type error])
Fix const core::panic!(non_literal_str). #78069 (Fix const core::panic!(non_literal_str).)
Cleanup constant matching in exhaustiveness checking #78072 (Cleanup constant matching in exhaustiveness checking)
Throw core::panic!("message") as &str instead of String. #78119 (Throw core::panic!("message") as &str instead of String.)
Introduce a temporary for discriminant value in MatchBranchSimplification #78191 (Introduce a temporary for discriminant value in MatchBranchSimplification)
const_evaluatable_checked: deal with unused nodes + div #78272 (const_evaluatable_checked: deal with unused nodes + div)
TyCtxt: generate single impl block with slice_interners macro #78318 (TyCtxt: generate single impl block with slice_interners macro)
resolve: Relax macro resolution consistency check to account for any errors #78327 (resolve: Relax macro resolution consistency check to account for any errors)

Failed merges:

#77147 simplifies things by splitting this Mutex type into two types matching the two use cases: StaticMutex and MovableMutex. To support the behavior of StaticMutex, we move part of the mutex implementation into libstd.

the commit avoid an alignement issue in Mutex implementation

… them opaque

This deconfuses the comparison of floats, that currently mixed ranges and non-ranges.

This makes it consistent with std::panic!("message"), which also throws a &str, not a String.

It now throws a &str instead of a String.

…tion The optimization introduces additional uses of the discriminant operand, but does not ensure that it is still valid to evaluate it or that it still evaluates to the same value. Evaluate it once at original position, and store the result in a new temporary.

This issue was accidentally fixed recently, probably by #70743

@oli-obk

const_evaluatable_checked: deal with unused nodes + div r? @oli-obk

TyCtxt: generate single impl block with `slice_interners` macro Reduces the work needed to check overlapping impls a bit.

resolve: Relax macro resolution consistency check to account for any errors The check was previously omitted only when ambiguity errors or `Res::Err` were encountered, but the "macro-expanded `extern crate` items cannot shadow..." error (at least) can cause same inconsistencies as well. Fixes#78325

jonas-schievink · 2020-10-24T20:43:09Z

@bors r+ rollup=never p=12

@rustbot modify labels: rollup

bors · 2020-10-24T20:43:11Z

📌 Commit 58ae889 has been approved by jonas-schievink

bors · 2020-10-24T21:42:45Z

⌛ Testing commit 58ae889 with merge f58ffc9...

bors · 2020-10-25T00:24:39Z

☀️ Test successful - checks-actions
Approved by: jonas-schievink
Pushing f58ffc9 to master...

rust-highfive · 2020-10-25T00:25:45Z

📣 Toolstate changed by #78334!

Tested on commit f58ffc9.
Direct link to PR: #78334

💔 miri on windows: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).
💔 rustfmt on windows: test-pass → build-fail (cc @topecongiro @calebcartwright).
💔 rustfmt on linux: test-pass → build-fail (cc @topecongiro @calebcartwright).

@oli-obk

Tested on commit rust-lang/rust@f58ffc9. Direct link to PR: <rust-lang/rust#78334> 💔 miri on windows: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung). 💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung). 💔 rls on windows: test-pass → build-fail (cc @Xanewok). 💔 rls on linux: test-pass → build-fail (cc @Xanewok). 💔 rustfmt on windows: test-pass → build-fail (cc @topecongiro @calebcartwright). 💔 rustfmt on linux: test-pass → build-fail (cc @topecongiro @calebcartwright).

Mark-Simulacrum · 2020-10-27T15:23:04Z

This had some effect on compiler performance; I'm not sure which PRs were responsible. I suspect #78072 and #78191.

cc @Nadrieril @tmiasko -- do those perf results look like they could be because of those PRs? I think a good next step is probably to post reverts of each so that we can see if they were the cause.

jonas-schievink · 2020-10-27T15:24:21Z

I think #78191 only touches a disabled optimization

Nadrieril · 2020-10-27T16:04:19Z

@Mark-Simulacrum Ah yeah that very much looks like the effect of changes to match checking. My PR was based on #77390 which was a perf improvement so I didn't think to check.

Nadrieril · 2020-10-27T16:08:00Z

I have a followup PR (#78430) which I measured to be a large perf improvement, and would compensate the regression from #78072. If that's not enough I can bisect #78072, but that's more work

Mark-Simulacrum · 2020-10-27T16:09:16Z

Yeah, no worries, that sounds fine. Just wanted to make sure we had a clear idea of the cause. I don't think the regression(s) are bad enough to warrant doing more work here, especially as you have followup improvements that outweigh them.

stlankesand others added 30 commits October 11, 2020 11:53

using the latest version of libhermit-rs
98fcc3f

revise code to pass the format check
d560b50

revise comments and descriptions of the helper functions
986c1fc

fix typos in new method
d6e955f

revise code to pass the format check
530f575

add hermit to the list of omit OS
8d8a290

remove obsolete function diverge
33fd08b

reuse implementation of the system provider "unsupported"
30c3dad

define required type 'MovableMutex'
1741e5b

move __rg_oom to the libos to avoid duplicated symbols
bc6b2ac

minor changes to pass the format check
77d9831

box mutex to get a movable mutex
bf268fe
the commit avoid an alignement issue in Mutex implementation

#[deny(unsafe_op_in_unsafe_fn)] in sys/cloudabi
d3467fe

Add some tests
3b37d94

Destructure byte array constants to array patterns instead of keeping…
bb81110
… them opaque

Destructure byte slices and remove all the workarounds
c3d0445

A ConstantValue constructor with a slice pattern is an error
99852e0

Treat booleans as integers with valid range 0..=1
3708c86

Fix comment
f504e9a

Handle ranges of float consistently
aa41720
This deconfuses the comparison of floats, that currently mixed ranges and non-ranges.

Treat string literals separately from other constants
d1a784e

The only remaining constant patterns are opaque
da0ba2f

Add comment
c4ae6c2

Throw core::panic!("message") as &str instead of String.
2780e35
This makes it consistent with std::panic!("message"), which also throws a &str, not a String.

Fix ui test for updated core::panic behaviour.
9890217
It now throws a &str instead of a String.

Accidentallyfixed#78071
5bfd3e7

Add a test for#53708
3519411
This issue was accidentally fixed recently, probably by #70743

Explain the Opaque special case in specialization
faf8710

jonas-schievink added 3 commits October 24, 2020 22:39

Rollup merge of#78272- lcnr:abstract-const-unused-node, r=oli-obk
5ed8ac4
const_evaluatable_checked: deal with unused nodes + div r? @oli-obk

Rollup merge of#78318- bugadani:tyctx-impl, r=petrochenkov
a8ff5a4
TyCtxt: generate single impl block with `slice_interners` macro Reduces the work needed to check overlapping impls a bit.

rustbot added the rollup A PR which is a rollup label Oct 24, 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 Oct 24, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2020

bors merged commit f58ffc9 into rust-lang:masterOct 25, 2020

rustbot added this to the 1.49.0 milestone Oct 25, 2020

This was referenced Oct 25, 2020
miri no longer builds after rust-lang/rust#78334 #78339
Closed
rls no longer builds after rust-lang/rust#78334 #78340
Closed
rustfmt no longer builds after rust-lang/rust#78334 #78341
Closed

bors mentioned this pull request Oct 25, 2020
Move the query engine out of rustc_middle #70951
Merged

jonas-schievink deleted the rollup-z0gzbmm branch October 27, 2020 21:23

Navigation Menu

Uh oh!

Uh oh!

Rollup of 12 pull requests - #78334

Rollup of 12 pull requests#78334
bors merged 57 commits into
rust-lang:masterfrom
jonas-schievink:rollup-z0gzbmm

jonas-schievink commented Oct 24, 2020

Uh oh!

jonas-schievink commented Oct 24, 2020

Uh oh!

bors commented Oct 24, 2020

Uh oh!

bors commented Oct 24, 2020

Uh oh!

bors commented Oct 25, 2020

Uh oh!

rust-highfive commented Oct 25, 2020

Uh oh!

Mark-Simulacrum commented Oct 27, 2020

Uh oh!

jonas-schievink commented Oct 27, 2020

Uh oh!

Nadrieril commented Oct 27, 2020

Uh oh!

Nadrieril commented Oct 27, 2020

Uh oh!

Mark-Simulacrum commented Oct 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants

Uh oh!

Uh oh!

Conversation

jonas-schievink commented Oct 24, 2020

Uh oh!

jonas-schievink commented Oct 24, 2020

Uh oh!

bors commented Oct 24, 2020

Uh oh!

bors commented Oct 24, 2020

Uh oh!

bors commented Oct 25, 2020

Uh oh!

rust-highfive commented Oct 25, 2020

Uh oh!

Mark-Simulacrum commented Oct 27, 2020

Uh oh!

jonas-schievink commented Oct 27, 2020

Uh oh!

Nadrieril commented Oct 27, 2020

Uh oh!

Nadrieril commented Oct 27, 2020

Uh oh!

Mark-Simulacrum commented Oct 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

16 participants