Skip to content
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.

Sign up for GitHub

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

Rollup of 7 pull requests #93716

Closed
wants to merge 14 commits into from
Closed

Rollup of 7 pull requests #93716

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
547b4e6
Add more *-unwind ABI variants
Amanieu Feb 1, 2022
0fb2b7a
Drop json::from_reader
Mark-Simulacrum Feb 5, 2022
2f23624
Drop time dependency from bootstrap
Mark-Simulacrum Feb 6, 2022
a4112dc
fix linking stage1 toolchain in setup
yerke Feb 6, 2022
57b102f
Fix tracking issue for `const_fn_trait_bound`
PatchMixolydic Feb 5, 2022
afb7a50
rewrite from_bytes_with_nul to match code style in from_vec_with_nul
inteon Feb 6, 2022
cf4ac6b
Add From<u8> for ExitCode
yaahc Jan 28, 2022
bf72ed1
Rollup merge of #92724 - inteon:cleanup, r=Mark-Simulacrum
matthiaskrgr Feb 6, 2022
62c7f1d
Rollup merge of #93445 - yaahc:exitcode-constructor, r=dtolnay
matthiaskrgr Feb 6, 2022
8a25218
Rollup merge of #93487 - yerke:yerke/fix-link-toolchain-in-setup, r=M…
matthiaskrgr Feb 6, 2022
25be507
Rollup merge of #93561 - Amanieu:more-unwind-abi, r=nagisa
matthiaskrgr Feb 6, 2022
edfcbba
Rollup merge of #93680 - Mark-Simulacrum:drop-json-reader, r=bjorn3
matthiaskrgr Feb 6, 2022
533bd38
Rollup merge of #93682 - PatchMixolydic:where-in-the-world-is-const_f…
matthiaskrgr Feb 6, 2022
1236691
Rollup merge of #93685 - Mark-Simulacrum:drop-time, r=pietroalbini
matthiaskrgr Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_feature/src/active.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ declare_features! (
/// Allows using and casting function pointers in a `const fn`.
(active, const_fn_fn_ptr_basics, "1.48.0", Some(57563), None),
/// Allows trait bounds in `const fn`.
(active, const_fn_trait_bound, "1.53.0", Some(57563), None),
(active, const_fn_trait_bound, "1.53.0", Some(93706), None),
/// Allows `for _ in _` loops in const contexts.
(active, const_for, "1.56.0", Some(87575), None),
/// Allows argument and return position `impl Trait` in a `const fn`.
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/consts/const_fn_trait_bound.stock.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0658]: trait bounds other than `Sized` on const fn parameters are unstabl
LL | const fn test1<T: std::ops::Add>() {}
| ^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait objects in const fn are unstable
Expand All @@ -13,7 +13,7 @@ error[E0658]: trait objects in const fn are unstable
LL | const fn test2(_x: &dyn Send) {}
| ^^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait objects in const fn are unstable
Expand All @@ -22,7 +22,7 @@ error[E0658]: trait objects in const fn are unstable
LL | const fn test3() -> &'static dyn Send { loop {} }
| ^^^^^^^^^^^^^^^^^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error: aborting due to 3 previous errors
Expand Down
24 changes: 12 additions & 12 deletions src/test/ui/consts/min_const_fn/min_const_fn.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ error[E0658]: trait bounds other than `Sized` on const fn parameters are unstabl
LL | const fn foo11<T: std::fmt::Display>(t: T) -> T { t }
| ^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait bounds other than `Sized` on const fn parameters are unstable
Expand All @@ -145,7 +145,7 @@ error[E0658]: trait bounds other than `Sized` on const fn parameters are unstabl
LL | const fn foo11_2<T: Send>(t: T) -> T { t }
| ^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0013]: constant functions cannot refer to statics
Expand Down Expand Up @@ -218,7 +218,7 @@ LL |
LL | const fn foo(&self) {}
| ------------------- function declared as const here
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait bounds other than `Sized` on const fn parameters are unstable
Expand All @@ -230,7 +230,7 @@ LL |
LL | const fn foo2(&self) {}
| -------------------- function declared as const here
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait bounds other than `Sized` on const fn parameters are unstable
Expand All @@ -242,7 +242,7 @@ LL |
LL | const fn foo3(&self) {}
| -------------------- function declared as const here
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait bounds other than `Sized` on const fn parameters are unstable
Expand All @@ -251,7 +251,7 @@ error[E0658]: trait bounds other than `Sized` on const fn parameters are unstabl
LL | const fn no_apit2(_x: AlanTuring<impl std::fmt::Debug>) {}
| ^^^^^^^^^^^^^^^^^^^^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0493]: destructors cannot be evaluated at compile-time
Expand All @@ -268,7 +268,7 @@ error[E0658]: trait bounds other than `Sized` on const fn parameters are unstabl
LL | const fn no_apit(_x: impl std::fmt::Debug) {}
| ^^^^^^^^^^^^^^^^^^^^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0493]: destructors cannot be evaluated at compile-time
Expand All @@ -285,7 +285,7 @@ error[E0658]: trait objects in const fn are unstable
LL | const fn no_dyn_trait(_x: &dyn std::fmt::Debug) {}
| ^^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait objects in const fn are unstable
Expand All @@ -294,7 +294,7 @@ error[E0658]: trait objects in const fn are unstable
LL | const fn no_dyn_trait_ret() -> &'static dyn std::fmt::Debug { &() }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait objects in const fn are unstable
Expand All @@ -305,7 +305,7 @@ LL | const fn really_no_traits_i_mean_it() { (&() as &dyn std::fmt::Debug, ()).1
| |
| function declared as const here
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait objects in const fn are unstable
Expand All @@ -316,7 +316,7 @@ LL | const fn really_no_traits_i_mean_it() { (&() as &dyn std::fmt::Debug, ()).1
| |
| function declared as const here
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait objects in const fn are unstable
Expand All @@ -327,7 +327,7 @@ LL | const fn really_no_traits_i_mean_it() { (&() as &dyn std::fmt::Debug, ()).1
| |
| function declared as const here
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: function pointers cannot appear in constant functions
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/consts/min_const_fn/min_const_fn_dyn.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LL | const fn no_inner_dyn_trait2(x: Hide) {
LL | x.0.field;
| ^^^^^^^^^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error[E0658]: trait objects in const fn are unstable
Expand All @@ -17,7 +17,7 @@ LL | const fn no_inner_dyn_trait_ret() -> Hide { Hide(HasDyn { field: &0 }) }
| |
| function declared as const here
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error: aborting due to 2 previous errors
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/nll/issue-55825-const-fn.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0658]: trait objects in const fn are unstable
LL | const fn no_dyn_trait_ret() -> &'static dyn std::fmt::Debug { &() }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: see issue #57563 </~https://github.com/rust-lang/rust/issues/57563> for more information
= note: see issue #93706 </~https://github.com/rust-lang/rust/issues/93706> for more information
= help: add `#![feature(const_fn_trait_bound)]` to the crate attributes to enable

error: aborting due to previous error
Expand Down