bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

tidy

Browse source 
rustfmt, pleaaaaase, start supporting rust

Co-authored-by: nils <48135649+Nilstrieb@users.noreply.github.com>
This commit is contained in:
Waffle Maybe 2023-01-09 20:42:36 +04:00 • committed by Maybe Waffle
parent 09485eaae1
commit 66751ea73e
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_const_eval/src/transform/promote_consts.rs
View file

@ -847,7 +847,7 @@ impl<'a, 'tcx> Promoter<'a, 'tcx> {
let local_decls = &mut self.source.local_decls; let local_decls = &mut self.source.local_decls;
let loc = candidate.location; let loc = candidate.location;
let statement = &mut blocks[loc.block].statements[loc.statement_index]; let statement = &mut blocks[loc.block].statements[loc.statement_index];
let StatementKind::Assign(box (_, Rvalue::Ref(region, borrow_kind, place)))= &mut statement.kind else { let StatementKind::Assign(box (_, Rvalue::Ref(region, borrow_kind, place))) = &mut statement.kind else {
bug!() bug!()
}; };

2
compiler/rustc_mir_build/src/build/expr/stmt.rs
View file

@ -113,7 +113,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// //
// it is usually better to focus on `the_value` rather // it is usually better to focus on `the_value` rather
// than the entirety of block(s) surrounding it. // than the entirety of block(s) surrounding it.
let adjusted_span = let adjusted_span =
if let ExprKind::Block { block } = expr.kind if let ExprKind::Block { block } = expr.kind
&& let Some(tail_ex) = this.thir[block].expr && let Some(tail_ex) = this.thir[block].expr
{ {

31
compiler/rustc_mir_build/src/thir/pattern/deconstruct_pat.rs
View file

@ -141,23 +141,22 @@ impl IntRange {
) -> Option<IntRange> { ) -> Option<IntRange> {
let ty = value.ty(); let ty = value.ty();
if let Some((target_size, bias)) = Self::integral_size_and_signed_bias(tcx, ty) { if let Some((target_size, bias)) = Self::integral_size_and_signed_bias(tcx, ty) {
let val = let val = if let mir::ConstantKind::Val(ConstValue::Scalar(scalar), _) = value {
if let mir::ConstantKind::Val(ConstValue::Scalar(scalar), _) = value { // For this specific pattern we can skip a lot of effort and go
// For this specific pattern we can skip a lot of effort and go // straight to the result, after doing a bit of checking. (We
// straight to the result, after doing a bit of checking. (We // could remove this branch and just fall through, which
// could remove this branch and just fall through, which // is more general but much slower.)
// is more general but much slower.) scalar.to_bits_or_ptr_internal(target_size).unwrap().left()?
scalar.to_bits_or_ptr_internal(target_size).unwrap().left()? } else {
} else { if let mir::ConstantKind::Ty(c) = value
if let mir::ConstantKind::Ty(c) = value && let ty::ConstKind::Value(_) = c.kind()
&& let ty::ConstKind::Value(_) = c.kind() {
{ bug!("encountered ConstValue in mir::ConstantKind::Ty, whereas this is expected to be in ConstantKind::Val");
bug!("encountered ConstValue in mir::ConstantKind::Ty, whereas this is expected to be in ConstantKind::Val"); }
}
// This is a more general form of the previous case. // This is a more general form of the previous case.
value.try_eval_bits(tcx, param_env, ty)? value.try_eval_bits(tcx, param_env, ty)?
}; };
let val = val ^ bias; let val = val ^ bias;
Some(IntRange { range: val..=val, bias }) Some(IntRange { range: val..=val, bias })
} else { } else {