-
Notifications
You must be signed in to change notification settings - Fork 14k
Rollup of 22 pull requests #148721
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Rollup of 22 pull requests #148721
Conversation
Undo rust-analyzer changes
This adds to the existing proxy impl for &T.
lld is a great choice for a default linker.
This patch enables the std locking functions on AIX by including AIX on the list
of supported targets for the locking functions. Excluding AIX from the std
locking functions results to compilation errors such as: ("try_lock() not supported").
Updated email addresses for several contributors in the mailmap.
… user-defined function names
Signed-off-by: Jonathan Brouwer <jonathantbrouwer@gmail.com>
Signed-off-by: Jonathan Brouwer <jonathantbrouwer@gmail.com>
…=BoxyUwU Add `overflow_checks` intrinsic This adds an intrinsic which allows code in a pre-built library to inherit the overflow checks option from a crate depending on it. This enables code in the standard library to explicitly change behavior based on whether `overflow_checks` are enabled, regardless of the setting used when standard library was compiled. This is very similar to the `ub_checks` intrinsic, and refactors the two to use a common mechanism. The primary use case for this is to allow the new `RangeFrom` iterator to yield the maximum element before overflowing, as requested [here](rust-lang#125687 (comment)). This PR includes a working `IterRangeFrom` implementation based on this new intrinsic that exhibits the desired behavior. [Prior discussion on Zulip](https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/Ability.20to.20select.20code.20based.20on.20.60overflow_checks.60.3F)
…f, r=JonathanBrouwer
Add correct suggestion for multi-references for self type in method
Currently the suggestion for this code
```rust
fn main() {}
struct A {
field: i32,
}
impl A {
fn f(&&self) {}
}
```
looks like this, which is incorrect and missleading
```rust
Compiling playground v0.0.1 (/playground)
error: expected one of `!`, `(`, `...`, `..=`, `..`, `::`, `:`, `{`, or `|`, found `)`
--> src/main.rs:8:16
|
8 | fn f(&&self) {}
| ^ expected one of 9 possible tokens
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: explicitly ignore the parameter name
|
8 | fn f(_: &&self) {}
| ++
```
So this fixes it and make more correct suggestions
```rust
error: expected one of `!`, `(`, `...`, `..=`, `..`, `::`, `:`, `{`, or `|`, found `)`
--> /home/gh-Kivooeo/test_/src/main.rs:8:16
|
8 | fn f(&&self) {}
| ^ expected one of 9 possible tokens
|
help: `self` should be `self`, `&self` or `&mut self`, please remove extra references
|
8 - fn f(&&self) {}
8 + fn f(&self) {}
```
Implementation is pretty self-documenting, but if you have suggestions on how to improve this (according to current test, which may be not fully covering all cases, this is works very well) or have some funny edge cases to show, I would appreciate it
r? compiler
…Simulacrum [DebugInfo] Fix container types failing to find template args This is a less pervasive (but also less powerful) alternative to rust-lang#144394. This change *only* provides benefits to container types on MSVC. The TL;DR is that nodes that don't populate/aren't discoverable in the PDB for various reasons are given an alternate lookup path that generates the nodes by acquiring the base-type via some gross string manipulation and then asking clang for the node it wants (e.g. `"ref$<i32>"` -> `"i32"` -> `target.FindFirstType("i32").GetPointerType()` -> `i32 *`, which is a valid type for the container to use) The before/afters are the same as in the above PR's `*-msvc` LLDB screenshots. This works as a stopgap while the above PR is evaluated, but I think that PR is still a much better solution.
…Jung Show packed field alignment in mir_transform_unaligned_packed_ref Fixes rust-lang#147528 I left the expected padding for the field out of the error message so the message would be the same on all platforms. It also isn't always possible to know the expected alignment, so this makes the message simpler.
Rename `downcast_[ref|mut]_unchecked` -> `downcast_unchecked_[ref|mut]` ## Intent Renames `downcast_[ref|mut]_unchecked` to `downcast_unchecked_[ref|mut]` because we want to emphasise that it is the downcast that is unsafe, not the aliasing per: rust-lang#90850 (comment) ## Tracking Issue: rust-lang#90850 (comment) cc `@marc0246`
Add Allocator proxy impls for Box, Rc, and Arc This adds to the existing proxy impl for &T. Fixes rust-lang/wg-allocators#54
…ng, r=Kivooeo `invalid_atomic_ordering`: also lint `update` & `try_update` Split from rust-lang#148590 Tracking issue for `update` and `try_update`: rust-lang#135894
…-hygiene-diagnostic, r=JonathanBrouwer Add note for identifier with attempted hygiene violation Fixes rust-lang#148580 I changed the original test to make sure we are pointing to the right scope.
…nBrouwer,Noratrieb Switch hexagon targets to rust-lld lld is a great choice for a default linker.
…AIX, r=workingjubilee
Enable std locking functions on AIX
This patch enables the std locking functions on AIX by including AIX on the list of supported targets for the locking functions. Excluding AIX from the std locking functions results to compilation errors such as: ("try_lock() not supported").
…pen, r=Kobzol [bootstrap] Make `--open` option work with `doc src/tools/error_index_generator` Fixes rust-lang#148557.
don't completely reset `HeadUsages` This is really subtle ☠️ I've actually went and added testing for `search_graph.ignore_candidate_head_usages` to https://github.com/lcnr/search_graph_fuzz now. I should have done that when I originally implemented but didn't quite know how to do so back then. The search graph is far too subtle to think through it manually. I've added the affected proof tree to https://github.com/rust-lang/trait-system-refactor-initiative/blob/main/notes/next-solver/search-graph/general.md#keeping-provisional-cache-entries-on-rerun. It's - A - B - C (depends on B and gets dropped when rerunning) - D (does not depend on B so we keep it around when rerunning) - C (irrevant candidate) - A - B - D - C (irrevant candidate) - D - A - rerun - C (use provisional cache entry which doesn't depend on B) - D (use provisional cache entry which doesn't depend on B) Fixes the ICE in rust-lang/trait-system-refactor-initiative#246 (comment). I think this issue is brittle enough that adding that as a test isn't really useful. Any small change to the search graph will prevent it from testing this. We do test this fix via the fuzzer. r? `````@BoxyUwU`````
…athanBrouwer Remove a remnant of `dyn*` from the parser Follow-up to rust-lang#146664 and rust-lang#143036. `is_explicit_dyn_type` still checked for `TokenKind::Star` which made no sense now that `dyn*` is no more. Removing it doesn't represent a functional change and merely affects diagnostics. That's because the check only dictated whether to interpret `dyn` as the start of a trait object type in Rust 2015 (where this identifier is only a *contextual* keyword). However, we would still fail at the `*` later on as it doesn't start a bound. While at it, I also took the time to clean up in the vicinity.
Remove eslint-js from npm dependencies Testing if this unblocks CI. r? ```@ghost```
Recover `[T: N]` as `[T; N]` `;` is similar and (keyboard-wise) next to `:`, so a verbose suggestion may help to see the difference. Parent PR: rust-lang#143905 --- `@rustbot` label +A-parser +A-array +A-diagnostics +A-suggestion-diagnostics +D-papercut
…=jdonszelmann Remove unused argument `features` from `eval_config_entry`
…e_id, r=Kivooeo Use the current lint note id when parsing `cfg!()`
|
Rollup of almost everything not in #148692, except for a second iffy, and a second debuginfo-related PR that I would prefer not to rollup with the first one. I expect such a large rollup fail with some kind of unforeseen error, but that's fine. Flushing out problems is part of CI's job. @bors r+ rollup=never p=5 |
|
Queue is getting pretty big, so let's use try jobs to help flush out failures. @bors try jobs=x86_64-msvc-1,i686-msvc-1,x86_64-mingw-1,test-various,armhf-gnu,aarch64-apple |
This comment has been minimized.
This comment has been minimized.
Rollup of 22 pull requests try-job: x86_64-msvc-1 try-job: i686-msvc-1 try-job: x86_64-mingw-1 try-job: test-various try-job: armhf-gnu try-job: aarch64-apple
Rollup of 22 pull requests Successful merges: - #128666 (Add `overflow_checks` intrinsic) - #146305 (Add correct suggestion for multi-references for self type in method) - #147179 ([DebugInfo] Fix container types failing to find template args) - #147743 (Show packed field alignment in mir_transform_unaligned_packed_ref) - #148079 (Rename `downcast_[ref|mut]_unchecked` -> `downcast_unchecked_[ref|mut]`) - #148084 (Optimize path components iteration on platforms that don't have prefixes) - #148126 (Fix rust stdlib build failing for VxWorks) - #148204 (Modify contributor email entries in .mailmap) - #148279 (rustc_builtin_macros: rename bench parameter to avoid collisions with user-defined function names) - #148333 (constify result unwrap unchecked) - #148539 (Add Allocator proxy impls for Box, Rc, and Arc) - #148601 (`invalid_atomic_ordering`: also lint `update` & `try_update`) - #148612 (Add note for identifier with attempted hygiene violation) - #148613 (Switch hexagon targets to rust-lld) - #148619 (Enable std locking functions on AIX) - #148644 ([bootstrap] Make `--open` option work with `doc src/tools/error_index_generator`) - #148649 (don't completely reset `HeadUsages`) - #148673 (Remove a remnant of `dyn*` from the parser) - #148675 (Remove eslint-js from npm dependencies) - #148680 (Recover `[T: N]` as `[T; N]`) - #148688 (Remove unused argument `features` from `eval_config_entry`) - #148711 (Use the current lint note id when parsing `cfg!()`) r? `@ghost` `@rustbot` modify labels: rollup
Successful merges:
overflow_checksintrinsic #128666 (Addoverflow_checksintrinsic)downcast_[ref|mut]_unchecked->downcast_unchecked_[ref|mut]#148079 (Renamedowncast_[ref|mut]_unchecked->downcast_unchecked_[ref|mut])invalid_atomic_ordering: also lintupdate&try_update#148601 (invalid_atomic_ordering: also lintupdate&try_update)--openoption work withdoc src/tools/error_index_generator#148644 ([bootstrap] Make--openoption work withdoc src/tools/error_index_generator)HeadUsages#148649 (don't completely resetHeadUsages)dyn*from the parser #148673 (Remove a remnant ofdyn*from the parser)[T: N]as[T; N]#148680 (Recover[T: N]as[T; N])featuresfromeval_config_entry#148688 (Remove unused argumentfeaturesfromeval_config_entry)cfg!()#148711 (Use the current lint note id when parsingcfg!())r? @ghost
@rustbot modify labels: rollup
Create a similar rollup