Stabilize explicit_generic_args_with_impl_trait#96868

nrc · 2022-05-09T14:23:33Z

This is a stabilisation PR for explicit_generic_args_with_impl_trait.

tracking issue
- Stabilisation report
- FCP entered
implementation PR
Reference PR
There is no mention of using the turbofish operator in the book (other than an entry in the operator list in the appendix), so there is no documentation to change/add there, unless we felt like we should add a section on using turbofish, but that seems orthogonal to explicit_generic_args_with_impl_trait

rust-highfive · 2022-05-09T14:23:36Z

r? @petrochenkov

(rust-highfive has picked a reviewer for you, use r? to override)

petrochenkov · 2022-05-09T14:24:48Z

r? rust-lang/compiler

fmease · 2022-05-09T14:34:24Z

src/test/ui/inference/issue-83606.stderr

It seems like this PR re-introduces #83606.

It doesn't, 83606 is no longer an issue because we can now specify const generics even if an impl Trait argument type exists. I have removed the comment which no longer applies.

It might be better to just remove this test, but I figured it is good to test that we don't ICE or something.

nagisa · 2022-05-10T18:34:48Z

r? rust-lang/compiler

I won't be able to get to reviewing things for the upcoming next couple weeks.

jhpratt

Not on the compiler team (or an official reviewer) but I have stabilized some language features in the past.

Overall the diff looks good. There's really only thing thing that I don't understand why it was changed; the others are nits.

jhpratt · 2022-05-11T21:40:06Z

src/test/ui/impl-trait/explicit-generic-args-with-impl-trait/const-args.rs

Why is this necessary? Running this on nightly with only #![feature(explicit_generic_args_with_impl_trait)] (which is what's being stabilized here) succeeds as expected.

Huh, you're right I don't need these, I'm not sure why I thought I did, I think I copy-pasted them from a similar test without thinking too much.

src/test/ui/inference/issue-83606.rs

compiler/rustc_feature/src/accepted.rs

compiler/rustc_typeck/src/astconv/generics.rs

nbdd0121

The changes LGTM apart from the things that @jhpratt already mentioned.

Thanks for pushing the stabilisation for this!

nrc · 2022-05-12T07:35:53Z

@jhpratt thanks for the review, all comments addressed.

bors · 2022-05-12T13:23:39Z

☔ The latest upstream changes (presumably #96853) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2022-06-03T16:01:41Z

☔ The latest upstream changes (presumably #89862) made this pull request unmergeable. Please resolve the merge conflicts.

nagisa · 2022-06-04T00:10:08Z

I think this just needs a rebase and a bors command. Given the two reviews, I think it is fine for you to instruct the bors accordingly by yourself in this instance, @nrc.

Signed-off-by: Nick Cameron <[email protected]>

nrc · 2022-06-10T08:14:21Z

@bors r+

bors · 2022-06-10T08:14:23Z

@nrc: 🔑 Insufficient privileges: Not in reviewers

nrc · 2022-06-10T08:14:55Z

@nagisa I don't have the privs, would you mind instructing bors please?

nagisa · 2022-06-10T09:42:23Z

@bors r=jhpratt,nbdd0121,nagisa delegate+

bors · 2022-06-10T09:42:25Z

📌 Commit 640a461 has been approved by jhpratt,nbdd0121,nagisa

bors · 2022-06-10T09:42:27Z

✌️ @nrc can now approve this pull request

Rollup of 6 pull requests Successful merges: - rust-lang#96868 (Stabilize explicit_generic_args_with_impl_trait) - rust-lang#97703 (some additional `need_type_info.rs` cleanup) - rust-lang#97812 (Suggest to swap a struct and a trait in trait impls) - rust-lang#97958 (ExitStatus docs fixups) - rust-lang#97967 (Mention `infer::Trace` methods on `infer::At` methods' docs) - rust-lang#97972 (Update #[doc(html_playground_url)] documentation to mention what the request will be) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

bors · 2022-06-11T08:46:15Z

⌛ Testing commit 640a461 with merge 7092d42...

Pkgsrc changes: * Adjust patches as needed & checksum updates. Upstream changes: Version 1.63.0 (2022-08-11) ========================== Language -------- - [Remove migrate borrowck mode for pre-NLL errors.][95565] - [Modify MIR building to drop repeat expressions with length zero.][95953] - [Remove label/lifetime shadowing warnings.][96296] - [Allow explicit generic arguments in the presence of `impl Trait` args.] [96868] - [Make `cenum_impl_drop_cast` warnings deny-by-default.][97652] - [Prevent unwinding when `-C panic=abort` is used regardless of declared ABI.][96959] - [lub: don't bail out due to empty binders.][97867] Compiler -------- - [Stabilize the `bundle` native library modifier,][95818] also removing the deprecated `static-nobundle` linking kind. - [Add Apple WatchOS compile targets\*.][95243] - [Add a Windows application manifest to rustc-main.][96737] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Implement `Copy`, `Clone`, `PartialEq` and `Eq` for `core::fmt::Alignment`.][94530] - [Extend `ptr::null` and `null_mut` to all thin (including extern) types.][94954] - [`impl Read and Write for VecDeque<u8>`.][95632] - [STD support for the Nintendo 3DS.][95897] - [Make write/print macros eagerly drop temporaries.][96455] - [Implement internal traits that enable `[OsStr]::join`.][96881] - [Implement `Hash` for `core::alloc::Layout`.][97034] - [Add capacity documentation for `OsString`.][97202] - [Put a bound on collection misbehavior.][97316] - [Make `std::mem::needs_drop` accept `?Sized`.][97675] - [`impl Termination for Infallible` and then make the `Result` impls of `Termination` more generic.][97803] - [Document Rust's stance on `/proc/self/mem`.][97837] Stabilized APIs --------------- - [`array::from_fn`] - [`Box::into_pin`] - [`BinaryHeap::try_reserve`] - [`BinaryHeap::try_reserve_exact`] - [`OsString::try_reserve`] - [`OsString::try_reserve_exact`] - [`PathBuf::try_reserve`] - [`PathBuf::try_reserve_exact`] - [`Path::try_exists`] - [`Ref::filter_map`] - [`RefMut::filter_map`] - [`NonNull::<[T]>::len`][`NonNull::<slice>::len`] - [`ToOwned::clone_into`] - [`Ipv6Addr::to_ipv4_mapped`] - [`unix::io::AsFd`] - [`unix::io::BorrowedFd<'fd>`] - [`unix::io::OwnedFd`] - [`windows::io::AsHandle`] - [`windows::io::BorrowedHandle<'handle>`] - [`windows::io::OwnedHandle`] - [`windows::io::HandleOrInvalid`] - [`windows::io::HandleOrNull`] - [`windows::io::InvalidHandleError`] - [`windows::io::NullHandleError`] - [`windows::io::AsSocket`] - [`windows::io::BorrowedSocket<'handle>`] - [`windows::io::OwnedSocket`] - [`thread::scope`] - [`thread::Scope`] - [`thread::ScopedJoinHandle`] These APIs are now usable in const contexts: - [`array::from_ref`] - [`slice::from_ref`] - [`intrinsics::copy`] - [`intrinsics::copy_nonoverlapping`] - [`<*const T>::copy_to`] - [`<*const T>::copy_to_nonoverlapping`] - [`<*mut T>::copy_to`] - [`<*mut T>::copy_to_nonoverlapping`] - [`<*mut T>::copy_from`] - [`<*mut T>::copy_from_nonoverlapping`] - [`str::from_utf8`] - [`Utf8Error::error_len`] - [`Utf8Error::valid_up_to`] - [`Condvar::new`] - [`Mutex::new`] - [`RwLock::new`] Cargo ----- - [Stabilize the `--config path` command-line argument.][cargo/10755] - [Expose rust-version in the environment as `CARGO_PKG_RUST_VERSION`.][cargo/10713] Compatibility Notes ------------------- - [`#[link]` attributes are now checked more strictly,][96885] which may introduce errors for invalid attribute arguments that were previously ignored. Internal Changes ---------------- These changes provide no direct user facing benefits, but represent significant improvements to the internals and overall performance of rustc and related tools. - [Prepare Rust for LLVM opaque pointers.][94214] [94214]: rust-lang/rust#94214 [94530]: rust-lang/rust#94530 [94954]: rust-lang/rust#94954 [95243]: rust-lang/rust#95243 [95565]: rust-lang/rust#95565 [95632]: rust-lang/rust#95632 [95818]: rust-lang/rust#95818 [95897]: rust-lang/rust#95897 [95953]: rust-lang/rust#95953 [96296]: rust-lang/rust#96296 [96455]: rust-lang/rust#96455 [96737]: rust-lang/rust#96737 [96868]: rust-lang/rust#96868 [96881]: rust-lang/rust#96881 [96885]: rust-lang/rust#96885 [96959]: rust-lang/rust#96959 [97034]: rust-lang/rust#97034 [97202]: rust-lang/rust#97202 [97316]: rust-lang/rust#97316 [97652]: rust-lang/rust#97652 [97675]: rust-lang/rust#97675 [97803]: rust-lang/rust#97803 [97837]: rust-lang/rust#97837 [97867]: rust-lang/rust#97867 [cargo/10713]: rust-lang/cargo#10713 [cargo/10755]: rust-lang/cargo#10755 [`array::from_fn`]: https://doc.rust-lang.org/stable/std/array/fn.from_fn.html [`Box::into_pin`]: https://doc.rust-lang.org/stable/std/boxed/struct.Box.html#method.into_pin [`BinaryHeap::try_reserve_exact`]: https://doc.rust-lang.org/stable/alloc/collections/binary_heap/struct.BinaryHeap.html#method.try_reserve_exact [`BinaryHeap::try_reserve`]: https://doc.rust-lang.org/stable/std/collections/struct.BinaryHeap.html#method.try_reserve [`OsString::try_reserve`]: https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.try_reserve [`OsString::try_reserve_exact`]: https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.try_reserve_exact [`PathBuf::try_reserve`]: https://doc.rust-lang.org/stable/std/path/struct.PathBuf.html#method.try_reserve [`PathBuf::try_reserve_exact`]: https://doc.rust-lang.org/stable/std/path/struct.PathBuf.html#method.try_reserve_exact [`Path::try_exists`]: https://doc.rust-lang.org/stable/std/path/struct.Path.html#method.try_exists [`Ref::filter_map`]: https://doc.rust-lang.org/stable/std/cell/struct.Ref.html#method.filter_map [`RefMut::filter_map`]: https://doc.rust-lang.org/stable/std/cell/struct.RefMut.html#method.filter_map [`NonNull::<slice>::len`]: https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.len [`ToOwned::clone_into`]: https://doc.rust-lang.org/stable/std/borrow/trait.ToOwned.html#method.clone_into [`Ipv6Addr::to_ipv4_mapped`]: https://doc.rust-lang.org/stable/std/net/struct.Ipv6Addr.html#method.to_ipv4_mapped [`unix::io::AsFd`]: https://doc.rust-lang.org/stable/std/os/unix/io/trait.AsFd.html [`unix::io::BorrowedFd<'fd>`]: https://doc.rust-lang.org/stable/std/os/unix/io/struct.BorrowedFd.html [`unix::io::OwnedFd`]: https://doc.rust-lang.org/stable/std/os/unix/io/struct.OwnedFd.html [`windows::io::AsHandle`]: https://doc.rust-lang.org/stable/std/os/windows/io/trait.AsHandle.html [`windows::io::BorrowedHandle<'handle>`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.BorrowedHandle.html [`windows::io::OwnedHandle`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.OwnedHandle.html [`windows::io::HandleOrInvalid`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.HandleOrInvalid.html [`windows::io::HandleOrNull`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.HandleOrNull.html [`windows::io::InvalidHandleError`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.InvalidHandleError.html [`windows::io::NullHandleError`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.NullHandleError.html [`windows::io::AsSocket`]: https://doc.rust-lang.org/stable/std/os/windows/io/trait.AsSocket.html [`windows::io::BorrowedSocket<'handle>`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.BorrowedSocket.html [`windows::io::OwnedSocket`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.OwnedSocket.html [`thread::scope`]: https://doc.rust-lang.org/stable/std/thread/fn.scope.html [`thread::Scope`]: https://doc.rust-lang.org/stable/std/thread/struct.Scope.html [`thread::ScopedJoinHandle`]: https://doc.rust-lang.org/stable/std/thread/struct.ScopedJoinHandle.html [`array::from_ref`]: https://doc.rust-lang.org/stable/std/array/fn.from_ref.html [`slice::from_ref`]: https://doc.rust-lang.org/stable/std/slice/fn.from_ref.html [`intrinsics::copy`]: https://doc.rust-lang.org/stable/std/intrinsics/fn.copy.html [`intrinsics::copy_nonoverlapping`]: https://doc.rust-lang.org/stable/std/intrinsics/fn.copy_nonoverlapping.html [`<*const T>::copy_to`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_to [`<*const T>::copy_to_nonoverlapping`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_to_nonoverlapping [`<*mut T>::copy_to`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_to-1 [`<*mut T>::copy_to_nonoverlapping`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_to_nonoverlapping-1 [`<*mut T>::copy_from`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_from [`<*mut T>::copy_from_nonoverlapping`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_from_nonoverlapping [`str::from_utf8`]: https://doc.rust-lang.org/stable/std/str/fn.from_utf8.html [`Utf8Error::error_len`]: https://doc.rust-lang.org/stable/std/str/struct.Utf8Error.html#method.error_len [`Utf8Error::valid_up_to`]: https://doc.rust-lang.org/stable/std/str/struct.Utf8Error.html#method.valid_up_to [`Condvar::new`]: https://doc.rust-lang.org/stable/std/sync/struct.Condvar.html#method.new [`Mutex::new`]: https://doc.rust-lang.org/stable/std/sync/struct.Mutex.html#method.new [`RwLock::new`]: https://doc.rust-lang.org/stable/std/sync/struct.RwLock.html#method.new

rust-highfive assigned petrochenkov May 9, 2022

rust-highfive assigned nagisa and unassigned petrochenkov May 9, 2022

fmease reviewed May 9, 2022

View reviewed changes

nrc force-pushed the turbo-stable branch 2 times, most recently from 1786b9d to 29ed414 Compare May 9, 2022 14:41

This comment has been minimized.

Sign in to view

nrc force-pushed the turbo-stable branch from 29ed414 to da4c3ab Compare May 9, 2022 15:15

This comment has been minimized.

Sign in to view

nrc force-pushed the turbo-stable branch from da4c3ab to 492ac3a Compare May 10, 2022 07:37

jhpratt reviewed May 11, 2022

View reviewed changes

nbdd0121 reviewed May 11, 2022

View reviewed changes

nrc force-pushed the turbo-stable branch from 492ac3a to b3b3da8 Compare May 12, 2022 07:34

nrc force-pushed the turbo-stable branch from b3b3da8 to 52e9a60 Compare May 23, 2022 02:09

Remove explicit-generic-args-with-impl-trait docs from unstable book

12872b6

Signed-off-by: Nick Cameron <[email protected]>

nrc force-pushed the turbo-stable branch from 52e9a60 to 271d842 Compare June 6, 2022 11:09

Deactivate feature gate explicit_generic_args_with_impl_trait

640a461

Signed-off-by: Nick Cameron <[email protected]>

nrc force-pushed the turbo-stable branch from 271d842 to 640a461 Compare June 6, 2022 11:22

c410-f3r mentioned this pull request Jun 8, 2022

Stabilize explicit_generic_args_with_impl_trait #97852

Closed

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 Jun 10, 2022

Dylan-DPC mentioned this pull request Jun 11, 2022

Rollup of 6 pull requests #97980

Merged

bors merged commit f1f44b9 into rust-lang:master Jun 11, 2022

rustbot added this to the 1.63.0 milestone Jun 11, 2022

nrc mentioned this pull request Jun 13, 2022

Add a note to the turbofish section about impl Trait rust-lang/reference#1212

Merged

compiler-errors mentioned this pull request Jun 19, 2022

Calling trait function declared with both explicit generics and impl Trait gives confusing errors #94836

Open

ChayimFriedman2 mentioned this pull request Jul 1, 2022

An unused type parameter and an impl in the argument position allows you to define a function that cannot be called #50990

Closed

Xiretza mentioned this pull request Jul 20, 2022

Tracking issue for explicit_generic_args_with_impl_trait #83701

Closed

3 tasks

ojeda mentioned this pull request Apr 3, 2023

Rust unstable features needed for the kernel Rust-for-Linux/linux#2

Open

drewtato mentioned this pull request May 1, 2024

Remove outdated info about impl Trait in parameters and generics in the same function rust-lang/reference#1495

Merged

Uh oh!

Conversation

nrc commented May 9, 2022

Uh oh!

rust-highfive commented May 9, 2022

Uh oh!

petrochenkov commented May 9, 2022

Uh oh!

fmease May 9, 2022

Choose a reason for hiding this comment

Uh oh!

nrc May 9, 2022

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

nagisa commented May 10, 2022

Uh oh!

jhpratt left a comment

Choose a reason for hiding this comment

Uh oh!

jhpratt May 11, 2022

Choose a reason for hiding this comment

Uh oh!

nrc May 12, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nbdd0121 left a comment

Choose a reason for hiding this comment

Uh oh!

nrc commented May 12, 2022

Uh oh!

bors commented May 12, 2022

Uh oh!

bors commented Jun 3, 2022

Uh oh!

nagisa commented Jun 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nrc commented Jun 10, 2022

Uh oh!

bors commented Jun 10, 2022

Uh oh!

nrc commented Jun 10, 2022

Uh oh!

nagisa commented Jun 10, 2022

Uh oh!

bors commented Jun 10, 2022

Uh oh!

bors commented Jun 10, 2022

Uh oh!

bors commented Jun 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

nagisa commented Jun 4, 2022 •

edited

Loading