bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #113539 - agnarrarendelle:master, r=workingjubilee

Browse source 
fixed typo

Hi, I have fixed a few typos in commands. Please review my pr.
This commit is contained in:
Matthias Krüger 2023-07-17 00:14:05 +02:00 • committed by GitHub
commit 2b4c194234
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/ty/consts/valtree.rs
View file

@ -24,7 +24,7 @@ pub enum ValTree<'tcx> {
Leaf(ScalarInt), Leaf(ScalarInt),
//SliceOrStr(ValSlice<'tcx>), //SliceOrStr(ValSlice<'tcx>),
// dont use SliceOrStr for now // don't use SliceOrStr for now
/// The fields of any kind of aggregate. Structs, tuples and arrays are represented by /// The fields of any kind of aggregate. Structs, tuples and arrays are represented by
/// listing their fields' values in order. /// listing their fields' values in order.
/// ///

2
compiler/rustc_trait_selection/src/traits/wf.rs
View file

@ -570,7 +570,7 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
)); ));
} }
ty::ConstKind::Expr(_) => { ty::ConstKind::Expr(_) => {
// FIXME(generic_const_exprs): this doesnt verify that given `Expr(N + 1)` the // FIXME(generic_const_exprs): this doesn't verify that given `Expr(N + 1)` the
// trait bound `typeof(N): Add<typeof(1)>` holds. This is currently unnecessary // trait bound `typeof(N): Add<typeof(1)>` holds. This is currently unnecessary
// as `ConstKind::Expr` is only produced via normalization of `ConstKind::Unevaluated` // as `ConstKind::Expr` is only produced via normalization of `ConstKind::Unevaluated`
// which means that the `DefId` would have been typeck'd elsewhere. However in // which means that the `DefId` would have been typeck'd elsewhere. However in

2
compiler/rustc_ty_utils/src/consts.rs
View file

@ -174,7 +174,7 @@ fn recurse_build<'tcx>(
} }
// `ExprKind::Use` happens when a `hir::ExprKind::Cast` is a // `ExprKind::Use` happens when a `hir::ExprKind::Cast` is a
// "coercion cast" i.e. using a coercion or is a no-op. // "coercion cast" i.e. using a coercion or is a no-op.
// This is important so that `N as usize as usize` doesnt unify with `N as usize`. (untested) // This is important so that `N as usize as usize` doesn't unify with `N as usize`. (untested)
&ExprKind::Use { source } => { &ExprKind::Use { source } => {
let arg = recurse_build(tcx, body, source, root_span)?; let arg = recurse_build(tcx, body, source, root_span)?;
ty::Const::new_expr(tcx, Expr::Cast(CastKind::Use, arg, node.ty), node.ty) ty::Const::new_expr(tcx, Expr::Cast(CastKind::Use, arg, node.ty), node.ty)