Commit graph

168427 commits

Author SHA1 Message Date
Matthias Krüger 76f662c963
Rollup merge of #97109 - TaKO8Ki:fix-misleading-cannot-infer-type-for-type-parameter-error, r=oli-obk
Fix misleading `cannot infer type for type parameter` error

closes #93198
2022-05-20 19:54:39 +02:00
Takayuki Maeda 3d0f9fb544 report ambiguous type parameters when their parents are impl or fn
fix ci error

emit err for `impl_item`
2022-05-20 23:04:44 +09:00
bors 22ee39504a Auto merge of #97211 - GuillaumeGomez:rollup-jul7x7e, r=GuillaumeGomez
Rollup of 6 pull requests

Successful merges:

 - #96565 (rustdoc: show implementations on `#[fundamental]` wrappers)
 - #97179 (Add new lint to enforce whitespace after keywords)
 - #97185 (interpret/validity: separately control checking numbers for being init and non-ptr)
 - #97188 (Remove unneeded null pointer asserts in ptr2int casts)
 - #97189 (Update .mailmap)
 - #97192 (Say "last" instead of "rightmost" in the documentation for `std::str:rfind`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
2022-05-20 13:18:37 +00:00
Guillaume Gomez 9b25cc0543
Rollup merge of #97192 - sunfishcode:sunfishcode/rightmost, r=thomcc
Say "last" instead of "rightmost" in the documentation for `std::str:rfind`

In the documentation comment for `std::str::rfind`, say "last" instead
of "rightmost" to describe the match that `rfind` finds. This follows the
spirit of #30459, for which `trim_left` and `trim_right` were replaced by
`trim_start` and `trim_end` to be more clear about how they work on
text which is displayed right-to-left.
2022-05-20 14:03:06 +02:00
Guillaume Gomez 474e12b201
Rollup merge of #97189 - pvdrz:patch-1, r=Mark-Simulacrum
Update .mailmap
2022-05-20 14:03:05 +02:00
Guillaume Gomez 9098f05b26
Rollup merge of #97188 - carbotaniuman:remove-null-assert, r=RalfJung
Remove unneeded null pointer asserts in ptr2int casts

This removes an assert that a pointer with address 0 has no provenance. This change is needed to support permissive provenance work in Miri, and seems justified by `ptr.with_addr(0)` working and a discussion on Zulip regarding LLVM semantics.

r? `@RalfJung`
2022-05-20 14:03:04 +02:00
Guillaume Gomez 706aa59efa
Rollup merge of #97185 - RalfJung:number-validity, r=oli-obk
interpret/validity: separately control checking numbers for being init and non-ptr

This lets Miri control this in a more fine-grained way.

r? `@oli-obk`
2022-05-20 14:03:03 +02:00
Guillaume Gomez 62569edcbd
Rollup merge of #97179 - GuillaumeGomez:eslint-lint, r=notriddle
Add new lint to enforce whitespace after keywords

r? `@notriddle`
2022-05-20 14:03:02 +02:00
Guillaume Gomez afcf099e30
Rollup merge of #96565 - notriddle:notriddle/impl-box, r=camelid
rustdoc: show implementations on `#[fundamental]` wrappers

Fixes #92940
2022-05-20 14:03:01 +02:00
bors 512a328e2f Auto merge of #95309 - lcnr:dropck-cleanup, r=nikomatsakis
rewrite `ensure_drop_params_and_item_params_correspond`

actually relating types here seems like it's overkill
2022-05-20 10:37:48 +00:00
lcnr 4a82bc9ea0 bool to custom enum 2022-05-20 11:50:07 +02:00
lcnr ced65022da update error message 2022-05-20 11:50:07 +02:00
lcnr 4fcf43f67c update comments 2022-05-20 11:49:29 +02:00
lcnr 5ac973426e rewrite ensure_drop_params_and_item_params_correspond 2022-05-20 11:49:29 +02:00
lcnr f3f68324cc move unique param check into rustc_middle 2022-05-20 11:27:06 +02:00
bors cd73afadae Auto merge of #96422 - tmccombs:mutex-unpoison, r=m-ou-se
Add functions to un-poison Mutex and RwLock

See discussion at https://internals.rust-lang.org/t/unpoisoning-a-mutex/16521/3
2022-05-20 08:06:56 +00:00
Thayne McCombs a65afd82d1 Remove references to guards in documentation for clear_poison 2022-05-20 00:15:26 -06:00
bors 52cc779524 Auto merge of #97147 - Mark-Simulacrum:stage0-bump, r=pietroalbini
stage0 bootstrap bump

r? `@pietroalbini`
2022-05-20 05:44:52 +00:00
bors f24ef2e296 Auto merge of #97029 - eholk:drop-tracking-yielding-in-match-guard, r=nikomatsakis
generator_interior: Count match pattern bindings as borrowed for the whole guard expression

The test case `yielding-in-match-guard.rs` was failing with `-Zdrop-tracking` enabled. The reason is that the copy of a local (`y`) was not counted as a borrow in typeck, while MIR did consider this as borrowed.

The correct thing to do here is to count pattern bindings are borrowed for the whole guard. Instead, what we were doing is to record the type at the use site of the variable and check if the variable comes from a borrowed pattern. Due to the fix for #57017, we were considering too small of a scope for this variable, which meant it was not counted as borrowed.

Because we now unconditionally record the borrow, rather than only for bindings that are used, this PR is also able to remove a lot of the logic around match bindings that was there before.

r? `@nikomatsakis`
2022-05-20 03:27:01 +00:00
bors 4d6992bc18 Auto merge of #97027 - cuviper:yesalias-refcell, r=thomcc
Use pointers in `cell::{Ref,RefMut}` to avoid `noalias`

When `Ref` and `RefMut` were based on references, they would get LLVM `noalias` attributes that were incorrect, because that alias guarantee is only true until the guard drops. A `&RefCell` on the same value can get a new borrow that aliases the previous guard, possibly leading to miscompilation. Using `NonNull` pointers in `Ref` and `RefCell` avoids `noalias`.

Fixes the library side of #63787, but we still might want to explore language solutions there.
2022-05-20 01:05:53 +00:00
Eric Holk 7d1dbdf3de Update IfLet syntax 2022-05-19 16:32:06 -07:00
Eric Holk fce4c7998b Remove old match guard pattern tracking code
This is subsumed by the new changes that count pattern variables as
bound for the whole guard expression.
2022-05-19 16:23:28 -07:00
Eric Holk d08efdec1c Borrow guard patterns for the body of the guard 2022-05-19 16:23:28 -07:00
Eric Holk 7db4c0277d Revert "Count copies of locals as borrowed temporaries"
This reverts commit 0d270b5e9f48268735f9a05462df65c9d1039855.
2022-05-19 16:23:28 -07:00
Eric Holk d5b72058fe Count copies of locals as borrowed temporaries 2022-05-19 16:23:27 -07:00
Eric Holk 577bf0f354 Further reduce test case
Thanks to @tmiasko for this one!
2022-05-19 16:23:27 -07:00
Eric Holk ab8c50f964 Add drop tracking version of yielding-in-match-guard.rs 2022-05-19 16:23:27 -07:00
bors a09d36deae Auto merge of #97180 - Dylan-DPC:rollup-aa5j2yw, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #96539 (Add release notes for 1.61.0)
 - #97142 (move processing of `source_scope_data` into `MutVisitor`'s impl of `Integrator` when inline)
 - #97155 (Fix doc typo)
 - #97169 (Improve `u32 as char` cast diagnostic)
 - #97170 (Remove unnecessay .report() on ExitCode)
 - #97171 (Add regression test for #88119)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
2022-05-19 22:43:00 +00:00
Dan Gohman b836cf6fb8 Say "last" instead of "rightmost" in the documentation for std::str::rfind.
In the documentation comment for `std::str::rfind`, say "last" instead
of "rightmost" to describe the match that `rfind` finds. This follows the
spirit of #30459, for which `trim_left` and `trim_right` were replaced by
`trim_start` and `trim_end` to be more clear about how they work on
text which is displayed right-to-left.
2022-05-19 15:31:17 -07:00
Christian Poveda b67fafddaa
Update .mailmap 2022-05-19 14:13:13 -05:00
carbotaniuman e24673502f Remove unneeded asserts 2022-05-19 13:51:53 -05:00
Ralf Jung 4bb152c4bc fmt 2022-05-19 20:34:37 +02:00
Ralf Jung 42a91ed70c bless 32bit 2022-05-19 20:20:36 +02:00
Ralf Jung 5514b1176f interpret/validity: separately control checking numbers for being init and non-ptr 2022-05-19 20:16:25 +02:00
Dylan DPC 1fb9be0cee
Rollup merge of #97171 - JohnTitor:issue-88119, r=compiler-errors
Add regression test for #88119

Closes #88119
2022-05-19 17:22:51 +02:00
Dylan DPC 175974743a
Rollup merge of #97170 - benediktwerner:master, r=JohnTitor
Remove unnecessay .report() on ExitCode

Since #93442, the return type is `ExitCode` anyway so there's no need to do a conversion using `.report()` (which is now just a no-op).
2022-05-19 17:22:51 +02:00
Dylan DPC 3913d99c40
Rollup merge of #97169 - gimbles:u32-diagnostic, r=petrochenkov
Improve `u32 as char` cast diagnostic

Fixes #97160
2022-05-19 17:22:50 +02:00
Dylan DPC 12644bc39d
Rollup merge of #97155 - alygin:patch-1, r=JohnTitor
Fix doc typo

Fixes a minor doc typo for `atomic::fence()`.
2022-05-19 17:22:49 +02:00
Dylan DPC 362f598a75
Rollup merge of #97142 - SparrowLii:inline, r=tmiasko
move processing of `source_scope_data` into `MutVisitor`'s impl of `Integrator` when inline

This PR fixes the FIXME in the inline mir-opt which moves processing of `source_scope_data` into `MutVisitor`'s impl of `Integrator` when inline
2022-05-19 17:22:48 +02:00
Dylan DPC 0ee37d5836
Rollup merge of #96539 - tmandry:relnotes-1.61, r=Mark-Simulacrum
Add release notes for 1.61.0

cc `@rust-lang/release`
2022-05-19 17:22:47 +02:00
Guillaume Gomez 8fe333abd0 Add new lint to enforce whitespace after keywords 2022-05-19 17:19:22 +02:00
gimbles 9e5c24eaf8 Improve u32 to char diagnostic 2022-05-19 20:03:40 +05:30
bors c067287049 Auto merge of #97024 - lcnr:simplify_type-sus, r=<try>
`simplify_type` improvements and cursed docs

the existing `TreatParams` enum pretty much mixes everything up. Not sure why this looked right to me in #94057

This also includes two changes which impact perf:
- `ty::Projection` with inference vars shouldn't be treated as a rigid type, even if fully normalized
- `ty::Placeholder` only unifies with itself, so actually return `Some` for them

r? `@nikomatsakis`
2022-05-19 13:08:51 +00:00
Yuki Okushi 676604bdd2
Add regression test for #88119 2022-05-19 20:51:32 +09:00
benediktwerner 7013dc52d5 Remove unnecessay .report() on ExitCode 2022-05-19 11:47:36 +02:00
bors 6913c7487e Auto merge of #97114 - klensy:cursor-ref, r=petrochenkov
use CursorRef more

This allows skipping clone of `TreeAndSpacing` (and `TokenTree`).
2022-05-19 09:27:55 +00:00
Thayne McCombs 66d88c9a18 Change clear_poison to take the lock instead of a guard 2022-05-19 01:53:41 -06:00
bors 67a9bcb31b Auto merge of #97103 - luqmana:asm-unwind-cleanup, r=Amanieu,tmiasko
Update MIR passes to handle unwinding Inline Asm

Some more follow up fixes from https://github.com/rust-lang/rust/pull/95864#issuecomment-1094165398

r? `@Amanieu`
2022-05-19 06:57:59 +00:00
Luqman Aden af7f53d6d0 Add mir-opt test for asm_unwind + panic=abort 2022-05-18 23:15:00 -07:00
bors 50872bdb99 Auto merge of #97033 - nbdd0121:unwind3, r=Amanieu
Remove libstd's calls to `C-unwind` foreign functions

Remove all libstd and its dependencies' usage of `extern "C-unwind"`.

This is a prerequiste of a WIP PR which will forbid libraries calling `extern "C-unwind"` functions to be compiled in `-Cpanic=unwind` and linked against `panic_abort` (this restriction is necessary to address soundness bug #96926).
Cargo will ensure all crates are compiled with the same `-Cpanic` but the std is only compiled `-Cpanic=unwind` but needs the ability to be linked into `-Cpanic=abort`.

Currently there are two places where `C-unwind` is used in libstd:
* `__rust_start_panic` is used for interfacing to the panic runtime. This could be `extern "Rust"`
* `_{rdl,rg}_oom`: a shim `__rust_alloc_error_handler` will be generated by codegen to call into one of these; they can also be `extern "Rust"` (in fact, the generated shim is used as `extern "Rust"`, so I am not even sure why these are not, probably because they used to `extern "C"` and was changed to `extern "C-unwind"` when we allow alloc error hooks to unwind, but they really should just be using Rust ABI).

For dependencies, there is only one `extern "C-unwind"` function call, in `unwind` crate. This can be expressed as a re-export.

More dicussions can be seen in the Zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/210922-project-ffi-unwind/topic/soundness.20in.20mixed.20panic.20mode

`@rustbot` label: T-libs F-c_unwind
2022-05-19 04:04:40 +00:00