Commit Graph

103675 Commits

Author SHA1 Message Date
bors 8960acf023 Auto merge of #66277 - peter-wilkins:impl-from-wider-non-zeros, r=SimonSapin
From<NonZero*> impls for wider NonZero types

Closes: https://github.com/rust-lang/rust/issues/66291
2019-12-10 10:11:37 +00:00
bors 883b6aacba Auto merge of #67039 - xfix:manually-implement-pin-traits, r=nikomatsakis
Use deref target in Pin trait implementations

Using deref target instead of pointer itself avoids providing access to `&Rc<T>` for malicious implementations, which would allow calling `Rc::get_mut`.

This is a breaking change necessary due to unsoundness, however the impact of it should be minimal.

This only fixes the issue with malicious `PartialEq` implementations, other `Pin` soundness issues are still here.

See <https://internals.rust-lang.org/t/unsoundness-in-pin/11311/73> for more details.
2019-12-10 06:52:45 +00:00
bors 975e83a32a Auto merge of #67184 - tmandry:rollup-mzqxtck, r=tmandry
Rollup of 11 pull requests

Successful merges:

 - #66892 (Format libcore with rustfmt (including tests and benches))
 - #67106 (resolve: Resolve visibilities on fields with non-builtin attributes)
 - #67113 (Print the visibility in `print_variant`.)
 - #67115 (Simplify `check_decl_no_pat`.)
 - #67119 (libstd miri tests: avoid warnings)
 - #67125 (Added ExactSizeIterator bound to return types)
 - #67138 (Simplify `Layout::extend_packed`)
 - #67145 (fix miri step debug printing)
 - #67149 (Do not ICE #67123)
 - #67155 (Move `Layout`s instead of binding by reference)
 - #67169 (inline some common methods on OsStr)

Failed merges:

r? @ghost
2019-12-10 02:41:00 +00:00
Tyler Mandry c255815240
Rollup merge of #67169 - lzutao:inline_osstr, r=nagisa
inline some common methods on OsStr

Closes #67150
2019-12-09 14:33:15 -08:00
Tyler Mandry 196ca9dc94
Rollup merge of #67155 - kraai:move-instead-of-binding-to-reference, r=cramertj
Move `Layout`s instead of binding by reference
2019-12-09 14:33:13 -08:00
Tyler Mandry c2702e38e4
Rollup merge of #67149 - JohnTitor:fix-ice-1, r=Dylan-DPC
Do not ICE #67123

Fixes #67123

r? @matthewjasper
2019-12-09 14:33:12 -08:00
Tyler Mandry 5ce5464faf
Rollup merge of #67145 - RalfJung:miri-step, r=oli-obk
fix miri step debug printing

r? @oli-obk
2019-12-09 14:33:10 -08:00
Tyler Mandry 6b6b6f3220
Rollup merge of #67138 - kraai:simplify-Layout-extend_packed, r=Amanieu
Simplify `Layout::extend_packed`
2019-12-09 14:33:09 -08:00
Tyler Mandry 28b112f2f4
Rollup merge of #67125 - hashedone:master, r=petrochenkov
Added ExactSizeIterator bound to return types

Fixes #66865
2019-12-09 14:33:08 -08:00
Tyler Mandry e775820088
Rollup merge of #67119 - RalfJung:miri-test-libstd, r=alexcrichton
libstd miri tests: avoid warnings

Ignore tests in a way that all the code still gets compiled, to get rid of all the "unused" warnings that otherwise show up when running the test suite in Miri.
2019-12-09 14:33:06 -08:00
Tyler Mandry a0e00f824a
Rollup merge of #67115 - Centril:simplify-check-decl-no-pat, r=davidtwco
Simplify `check_decl_no_pat`.

r? @davidtwco
2019-12-09 14:33:05 -08:00
Tyler Mandry 3340a5b48d
Rollup merge of #67113 - Centril:enum-vis-pretty-fix, r=davidtwco
Print the visibility in `print_variant`.

r? @davidtwco
cc @dtolnay for `syn` awareness.
2019-12-09 14:33:03 -08:00
Tyler Mandry 5c6941b567
Rollup merge of #67106 - petrochenkov:docerr, r=matthewjasper
resolve: Resolve visibilities on fields with non-builtin attributes

Follow-up to https://github.com/rust-lang/rust/pull/66669.

The first commit is primary (and also a backport candidate), the other ones are further cleanups.
In this case it's not strictly necessary to avoid reporting errors during speculative resolution because 1) all visibilities are resolved non-speculatively sooner or later and 2) error reporting infrastructure merges identical errors with identical spans anyway.

Fixes https://github.com/rust-lang/rust/issues/67006
r? @matthewjasper
2019-12-09 14:33:02 -08:00
Tyler Mandry 4166ce8674
Rollup merge of #66892 - dtolnay:fmt5, r=KodrAus
Format libcore with rustfmt (including tests and benches)

Important: two small non-rustfmt changes that will need close review:

- I added `#[rustfmt::skip]` to two manually arranged tables in src/libcore/benches/ascii.rs; see first commit in the PR.
- I added `// ignore-tidy-filelength` to src/libcore/ptr/mod.rs because rustfmt puts it over tidy's 3000 line limit; see second commit in the PR. I filed #66891 to follow up on breaking up that file. For now though having it be formatted is more important than having it below the line limit.

---

As with my previous formatting PRs, I am avoiding causing merge conflicts in other PRs by only touches those files that are not involved in any currently open PR. Files that appear in new PRs between when this PR is opened and when it makes it to the top of the bors queue will be reverted from this PR.

The list of files involved in open PRs is determined by querying GitHub's GraphQL API [with this script](https://gist.github.com/dtolnay/aa9c34993dc051a4f344d1b10e4487e8).

With the list of files from the script in outstanding_files, the relevant commands were:

```
$ find src/libcore -name '*.rs' \
    | xargs rustfmt --edition=2018 --unstable-features --skip-children
$ rg libcore outstanding_files | xargs git checkout --
```

To confirm no funny business:

```
$ git checkout $THIS_COMMIT^
$ git show --pretty= --name-only $THIS_COMMIT \
    | xargs rustfmt --edition=2018 --unstable-features --skip-children
$ git diff $THIS_COMMIT  # there should be no difference
```

r? @Dylan-DPC
2019-12-09 14:33:00 -08:00
Bartłomiej Kuras 989bf84af3 Added ExactSizeIterator bound to return types
This reverts commit d97379a96e.
2019-12-09 21:16:48 +01:00
bors 76a252ea9e Auto merge of #67110 - tmandry:bump-compiler-builtins, r=alexcrichton
Bump compiler-builtins

- https://github.com/rust-lang/compiler-builtins/pull/306
- https://github.com/rust-lang/compiler-builtins/pull/309
- https://github.com/rust-lang/compiler-builtins/pull/310
- https://github.com/rust-lang/compiler-builtins/pull/311
- https://github.com/rust-lang/compiler-builtins/pull/312
- https://github.com/rust-lang/compiler-builtins/pull/313
- https://github.com/rust-lang/compiler-builtins/pull/315
- https://github.com/rust-lang/compiler-builtins/pull/317
- https://github.com/rust-lang/compiler-builtins/pull/323
- https://github.com/rust-lang/compiler-builtins/pull/324
- https://github.com/rust-lang/compiler-builtins/pull/328

Adds support for backtraces from `__rust_probestack` plus other goodies.

r? @alexcrichton
2019-12-09 19:42:48 +00:00
Vadim Petrochenkov 5f6267c8b3 resolve: Make visibility resolution more speculative
To avoid potential duplicate diagnostics and separate the error reporting logic
2019-12-09 22:41:47 +03:00
Vadim Petrochenkov e2c962d3d0 resolve: Cleanup some field processing code 2019-12-09 22:33:28 +03:00
Vadim Petrochenkov 9e6725dcfe resolve: Resolve visibilities on fields with non-builtin attributes 2019-12-09 22:33:23 +03:00
bors 7de9402b77 Auto merge of #67096 - mark-i-m:fix-rustc-guide-2, r=ehuss
Update rustc-guide
2019-12-09 14:07:20 +00:00
bors 3ff17e7c5f Auto merge of #67016 - lqd:placeholder_loans, r=matthewjasper
In which we implement illegal subset relations errors using Polonius

This PR is the rustc side of implementing subset errors using Polonius. That is, in
```rust
fn foo<'a, 'b>(x: &'a u32, y: &'b u32) -> &'a u32 {
    y
}
```
returning `y` requires that `'b: 'a` but we have no evidence of that, so this is an error. (Evidence that the relation holds could come from explicit bounds, or via implied bounds).

Polonius outputs one such error per CFG point where the free region's placeholder loan unexpectedly flowed into another free region. While all these CFG locations could be useful in diagnostics in the future, rustc does not do that (and the duplication is only partially handled in the rest of the errors/diagnostics infrastructure, e.g. duplicate suggestions will be shown by the "outlives suggestions" or some of the `#[rustc_*]` NLL/MIR debug dumps), so I deduplicated the errors.

(The ordering also matters, otherwise some of the elided lifetime naming would change behaviour).

I've blessed a couple of tests, where the output is currently suboptimal:
- the `hrtb-perfect-forwarding` tests mix subset errors with higher-ranked subtyping, however the plan is for chalk to eventually take care of some of this to generate polonius constraints (i.e. it's not polonius' job). Until that happens, polonius will not see the error that NLL sees.
- some other tests have errors and diagnostics specific to `'static`, I _believe_ this to be because of it being treated as more "special" than in polonius. I believe the output is not wrong, but could be better, and appears elsewhere (I feel we'll need to look at polonius' handling of `'static` at some point in the future, maybe to match a bit more what NLL does when it produces errors)

I'll create a tracking issue in the polonius repo to record these 2 points (and a general "we'll need to go over the blessed output" issue, much like we did for NLLs)

The last blessed test is because it's an improvement: in this case, more errors/suggestions were computed, instead of the existing code path where this case apparently stops at the first error.

The `Naive` variant in Polonius computes those errors, so this PR also switches the default variant to that, as we're also in the process of temporarily deactivating all other variants (which exist mostly for performance considerations) until we have completed more work on completeness and correctness, before focusing on efficiency once again.

While most of the correctness in this PR is hidden in the polonius compare-mode (which of course passes locally), I've added a couple of smoke-tests to the existing ones, so that we have some confidence that it works (and keeps working) until we're in a position where we can run them on CI.

As mentioned during yesterday's wg-polonius meeting, @nikomatsakis has already read through most of this PR (and which is matching  what they thought needed to be done [during the recent Polonius sprint](https://hackmd.io/CGMNjt1hR_qYtsR9hgdGmw#Compiler-notes-on-generating-the-placeholder-loans-support)), but Matthew was hopefully going to review (again, not urgent), so:

r? @matthewjasper

(This updates to the latest `polonius-engine` release, and I'm not sure whether `Cargo.lock` updates can easily be rolled up, but apart from that: this changes little that's tested on CI, so seems safe-ish to rollup ?)
2019-12-09 10:50:41 +00:00
Lzu Tao bf1f1c242c inline some common methods on OsStr 2019-12-09 10:39:57 +00:00
Yuki Okushi b879ecccd0 Do not ICE on closure 2019-12-09 18:55:38 +09:00
bors dbbe4f10fa Auto merge of #67004 - estebank:issue-66958, r=eddyb
Do not ICE on async fn with non-Copy infered type arg

Fix #66958.
2019-12-09 05:16:48 +00:00
bors 2b0e6d2643 Auto merge of #67003 - cjgillot:corrida, r=Mark-Simulacrum
Fix TypedArena returning wrong pointers for recursive allocations

Closes #67001
2019-12-09 01:57:07 +00:00
Peter 8f6a06285e move from non zero impls to `libcore/convert/num.rs` 2019-12-08 23:49:30 +00:00
bors 14195e1f1d Auto merge of #66984 - GuillaumeGomez:move-clean-types, r=kinnison
Move clean types into their own file

This PR is just about moving clean types into their own files to make the code more clear and keep all `Clean` trait implementations on their own.

r? @kinnison
2019-12-08 22:44:01 +00:00
bors 59947fcae6 Auto merge of #66981 - michaelwoerister:measureme-0.5.0, r=Mark-Simulacrum
Update measureme crate to 0.5.0

This PR updates the `measureme` self-profiling crate to the latest release. Heads up, this version changes the trace file format, so the `summarize` tool on perf.rlo needs to be updated to 0.5 too.

r? @Mark-Simulacrum
cc @wesleywiser
2019-12-08 19:43:29 +00:00
bors db7ca254ea Auto merge of #66730 - hermitcore:master, r=alexcrichton
remove dependency from libhermit

The build process of the unikernel HermitCore is redesigned and doesn't longer depend on libhermit.
2019-12-08 16:34:38 +00:00
Matthew Kraai 4ea7bb8f12 Move `Layout`s instead of binding by reference 2019-12-08 08:36:22 -05:00
bors 4abb0ad273 Auto merge of #67147 - RalfJung:miri, r=RalfJung
update Miri

Fixes https://github.com/rust-lang/rust/issues/67124
2019-12-08 13:10:52 +00:00
Ralf Jung 3d05a2705f update Miri 2019-12-08 11:34:36 +01:00
Ralf Jung 2468b23ad5 fix miri step debug printing 2019-12-08 10:48:06 +01:00
bors e862c01aad Auto merge of #67140 - Centril:rollup-h7rbw7y, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #66325 (Change unused_labels from allow to warn)
 - #66991 (Cleanup BodyCache)
 - #67101 (use `#[allow(unused_attributes)]` to paper over incr.comp problem)
 - #67114 (Make `ForeignItem` an alias of `Item`.)
 - #67129 (Fixes typo)

Failed merges:

 - #66886 (Remove the borrow check::nll submodule)

r? @ghost
2019-12-08 06:02:54 +00:00
Mazdak Farrokhzad 32e27c2c9a
Rollup merge of #67129 - remexre:patch-1, r=Dylan-DPC
Fixes typo

`legacy_disrectory_ownership` vs `legacy_directory_ownership`
2019-12-08 03:39:50 +01:00
Mazdak Farrokhzad 0c9f669bde
Rollup merge of #67114 - Centril:foreign-item-alias, r=petrochenkov
Make `ForeignItem` an alias of `Item`.

Working towards the merging of items in AST and syntactically.

r? @petrochenkov
2019-12-08 03:39:48 +01:00
Mazdak Farrokhzad b8e921b8c8
Rollup merge of #67101 - rust-lang:ostrich, r=Mark-Simulacrum
use `#[allow(unused_attributes)]` to paper over incr.comp problem

Paper over the problem in #58633.

r? @Mark-Simulacrum
2019-12-08 03:39:47 +01:00
Mazdak Farrokhzad 56c0bea390
Rollup merge of #66991 - Nashenas88:body_cache_cleanup, r=eddyb
Cleanup BodyCache

After this PR:

- `BodyCache` is renamed to `BodyAndCache`
- `ReadOnlyBodyCache` is renamed to `ReadOnlyBodyAndCache`
- `ReadOnlyBodyAndCache::body` fn is removed and all calls to it are replaced by a deref (possible due to fix of its `Deref` imp in #65947)

cc @eddyb @oli-obk
2019-12-08 03:39:45 +01:00
Mazdak Farrokhzad 56f830e292
Rollup merge of #66325 - BartMassey:master, r=joshtriplett
Change unused_labels from allow to warn

Fixes #66324, making the unused_labels lint warn instead of allow by default. I'm told @rust-lang/lang will need to review this, and perhaps will want to do a crater run.
2019-12-08 03:39:43 +01:00
Matthew Kraai 2b2b16c2a4 Simplify `Layout::extend_packed` 2019-12-07 21:23:21 -05:00
Mazdak Farrokhzad baeed9266d leave a FIXME 2019-12-08 00:57:58 +01:00
Mazdak Farrokhzad e48fa2be32 use `#[allow(unused_attributes)]` to paper over incr.comp problem 2019-12-08 00:57:58 +01:00
bors de17464b14 Auto merge of #65881 - anp:implicit-caller-location, r=eddyb,oli-obk
Implement #[track_caller] attribute. (RFC 2091 4/N)

Implements the `#[track_caller]` attribute in both const and codegen contexts.

The const implementation walks up the stack to find the nearest untracked callsite.

The codegen implementation adds an implicit argument to tracked function calls, and populates it with either a call to the previously-landed intrinsic or if the caller has `#[track_caller]` with a copy of the location passed to the current function.

Also includes a little cleanup and a few comments in the other caller location areas.

[Depends on: 65664](https://github.com/rust-lang/rust/pull/65664)
[RFC 2091 text](https://github.com/rust-lang/rfcs/blob/master/text/2091-inline-semantic.md)
[Tracking issue](https://github.com/rust-lang/rust/issues/47809)
[Tracking doc](https://paper.dropbox.com/doc/track_rfc_2091_impl-notes--Anf1NwnIb0xcRv31YLIadyj0Ag-rwCdRc2fi2yvRZ7syGZ9q#:uid=863513134494965680023183&h2=TODO-actually-pass-location-to)
2019-12-07 21:14:39 +00:00
Nathan Ringo dfc04fc7a7
Fixes typo
`legacy_disrectory_ownership` vs `legacy_directory_ownership`
2019-12-07 14:09:43 -06:00
Bartłomiej Kuras d97379a96e Added ExactSizeIterator bound to return types
in librustc in several places
2019-12-07 20:00:09 +01:00
Konrad Borowski 61d9c00146 Explicitly refer to operator methods in Pin impls 2019-12-07 16:23:43 +01:00
bors 5c5c8eb864 Auto merge of #66927 - RalfJung:engines-dont-panic, r=oli-obk
Miri core engine: use throw_ub instead of throw_panic

See https://github.com/rust-lang/rust/issues/66902 for context: panicking is not really an "interpreter error", but just part of a normal Rust execution. This is a first step towards removing the `InterpError::Panic` variant: the core Miri engine does not use it any more.

ConstProp and ConstEval still use it, though. This will be addressed in future PRs.

From what I can tell, all the error messages this removes are actually duplicates.

r? @oli-obk @wesleywiser
2019-12-07 14:46:30 +00:00
Ralf Jung ab73d10a6e fix warnings with cfg(miri) 2019-12-07 12:47:18 +01:00
Ralf Jung ca2ffe3a80 liballoc: ignore tests in Miri instead of removing them entirely 2019-12-07 12:42:19 +01:00
Ralf Jung 7ba1232b5e libcore: ignore tests in Miri instead of removing them entirely 2019-12-07 12:38:13 +01:00