bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #117081 - GoodDaisy:master, r=wesleywiser

Browse source 
fix typos in comments
This commit is contained in:
Matthias Krüger 2023-10-24 17:08:59 +02:00 • committed by GitHub
commit 0aade2f0de
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_const_eval/src/interpret/eval_context.rs
View file

@ -1010,7 +1010,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
// Just make this an efficient immediate. // Just make this an efficient immediate.
// Note that not calling `layout_of` here does have one real consequence: // Note that not calling `layout_of` here does have one real consequence:
// if the type is too big, we'll only notice this when the local is actually initialized, // if the type is too big, we'll only notice this when the local is actually initialized,
// which is a bit too late -- we should ideally notice this alreayd here, when the memory // which is a bit too late -- we should ideally notice this already here, when the memory
// is conceptually allocated. But given how rare that error is and that this is a hot function, // is conceptually allocated. But given how rare that error is and that this is a hot function,
// we accept this downside for now. // we accept this downside for now.
Operand::Immediate(Immediate::Uninit) Operand::Immediate(Immediate::Uninit)

2
library/core/src/num/mod.rs
View file

@ -114,7 +114,7 @@ macro_rules! midpoint_impl {
without modifying the original"] without modifying the original"]
#[inline] #[inline]
pub const fn midpoint(self, rhs: $SelfT) -> $SelfT { pub const fn midpoint(self, rhs: $SelfT) -> $SelfT {
// Use the well known branchless algorthim from Hacker's Delight to compute // Use the well known branchless algorithm from Hacker's Delight to compute
// `(a + b) / 2` without overflowing: `((a ^ b) >> 1) + (a & b)`. // `(a + b) / 2` without overflowing: `((a ^ b) >> 1) + (a & b)`.
((self ^ rhs) >> 1) + (self & rhs) ((self ^ rhs) >> 1) + (self & rhs)
} }

2
src/doc/unstable-book/src/compiler-flags/check-cfg.md
View file

@ -123,7 +123,7 @@ rustc --check-cfg 'cfg(is_embedded, has_feathers, values(any()))' \
fn do_embedded() {} // and because names exhaustiveness was not disabled fn do_embedded() {} // and because names exhaustiveness was not disabled
#[cfg(has_feathers)] // This is expected as "has_feathers" was provided in cfg() #[cfg(has_feathers)] // This is expected as "has_feathers" was provided in cfg()
fn do_features() {} // and because names exhaustiveness was not disbaled fn do_features() {} // and because names exhaustiveness was not disabled
#[cfg(has_feathers = "zapping")] // This is expected as "has_feathers" was provided in cfg() #[cfg(has_feathers = "zapping")] // This is expected as "has_feathers" was provided in cfg()
// and because no value checking was enable for "has_feathers" // and because no value checking was enable for "has_feathers"