Skip to content

Rollup of 6 pull requests #106025

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

Merged
merged 23 commits into from
Dec 22, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4042f55
Don't ICE in check_must_not_suspend_ty for mismatched tuple arity
compiler-errors Dec 17, 2022
55c4164
Correct ModFlagBehavior for Aarch64 on LLVM-15
MasterAwesome Dec 20, 2022
872a6da
Remove an unused function
oli-obk Oct 6, 2022
c787de3
Fix some `~const` usage in libcore
oli-obk Oct 11, 2022
b0ed631
Some hir cleanups
oli-obk Nov 10, 2022
b2b859b
Some track_caller additions
oli-obk Oct 12, 2022
fedcc73
tracing: make flag checking less noisy
oli-obk Oct 11, 2022
ed61be6
Some ICE debugging aids
oli-obk Sep 21, 2022
5480ac5
Use `Error` behavior for LLVM versions prior to 15
MasterAwesome Dec 20, 2022
c8ebff6
Remove some unnecessary try_map_bound
compiler-errors Dec 21, 2022
0c09e2b
Substitute things correctly
compiler-errors Dec 21, 2022
978dd2e
Rename things to be a bit clearer
compiler-errors Dec 21, 2022
c6ef534
CollectAllMismatches relation should respect int/float infer vars
compiler-errors Dec 21, 2022
85a9d85
Don't call typeck if we have no typeck results
compiler-errors Dec 21, 2022
b60281f
Test that async blocks are UnwindSafe
Swatinem Dec 21, 2022
cb2c7bb
Clarify that raw retags are not permitted in Mir
JakobDegen Dec 21, 2022
7c4c620
Forbid `RetagKind::TwoPhase` as well
JakobDegen Dec 21, 2022
3eccc29
Rollup merge of #105837 - compiler-errors:issue-105728, r=estebank
matthiaskrgr Dec 22, 2022
924a1d4
Rollup merge of #105932 - MasterAwesome:aarch64-bti-llvm-15, r=nikic
matthiaskrgr Dec 22, 2022
ec7eb5b
Rollup merge of #105960 - oli-obk:effect_cleanup, r=fee1-dead
matthiaskrgr Dec 22, 2022
66544b5
Rollup merge of #105985 - compiler-errors:method-chain-nitpicks, r=es…
matthiaskrgr Dec 22, 2022
f340e68
Rollup merge of #105996 - Swatinem:async-is-unwindsafe, r=petrochenkov
matthiaskrgr Dec 22, 2022
d0d0ccd
Rollup merge of #106012 - JakobDegen:retag-raw, r=RalfJung
matthiaskrgr Dec 22, 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
Prev Previous commit
Next Next commit
Fix some ~const usage in libcore
  • Loading branch information
oli-obk committed Dec 20, 2022
commit c787de3bbd307cccbfaeb56421ad7ad898330676
4 changes: 2 additions & 2 deletions library/core/src/const_closure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ macro_rules! impl_fn_mut_tuple {
impl<'a, $($var,)* ClosureArguments, Function, ClosureReturnValue> const
FnOnce<ClosureArguments> for ConstFnMutClosure<($(&'a mut $var),*), Function>
where
Function: ~const Fn(($(&mut $var),*), ClosureArguments) -> ClosureReturnValue+ ~const Destruct,
Function: ~const Fn(($(&mut $var),*), ClosureArguments) -> ClosureReturnValue + ~const Destruct,
{
type Output = ClosureReturnValue;

Expand All @@ -64,7 +64,7 @@ macro_rules! impl_fn_mut_tuple {
impl<'a, $($var,)* ClosureArguments, Function, ClosureReturnValue> const
FnMut<ClosureArguments> for ConstFnMutClosure<($(&'a mut $var),*), Function>
where
Function: ~const Fn(($(&mut $var),*), ClosureArguments)-> ClosureReturnValue,
Function: ~const Fn(($(&mut $var),*), ClosureArguments)-> ClosureReturnValue + ~const Destruct,
{
extern "rust-call" fn call_mut(&mut self, args: ClosureArguments) -> Self::Output {
#[allow(non_snake_case)]
Expand Down
4 changes: 2 additions & 2 deletions library/core/src/hash/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ pub trait Hash {
/// println!("Hash is {:x}!", hasher.finish());
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
fn hash<H: Hasher>(&self, state: &mut H);
fn hash<H: ~const Hasher>(&self, state: &mut H);

/// Feeds a slice of this type into the given [`Hasher`].
///
Expand Down Expand Up @@ -980,7 +980,7 @@ mod impls {
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
impl<T: ?Sized + ~const Hash> const Hash for &mut T {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) {
fn hash<H: ~const Hasher>(&self, state: &mut H) {
(**self).hash(state);
}
}
Expand Down
2 changes: 1 addition & 1 deletion library/core/src/ops/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ see chapter in The Book <https://doc.rust-lang.org/book/ch08-02-strings.html#ind
#[doc(alias = "]")]
#[doc(alias = "[]")]
#[const_trait]
pub trait IndexMut<Idx: ?Sized>: Index<Idx> {
pub trait IndexMut<Idx: ?Sized>: ~const Index<Idx> {
/// Performs the mutable indexing (`container[index]`) operation.
///
/// # Panics
Expand Down