Skip to content

Commit f1999aa

Browse files
authored
Revert changes
1 parent 3d3a7bd commit f1999aa

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

library/core/src/array/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl<T, const N: usize> IntoIterator for [T; N] {
6666
// FIXME: If normal `transmute` ever gets smart enough to allow this
6767
// directly, use it instead of `transmute_unchecked`.
6868
let data: [MaybeUninit<T>; N] = unsafe { transmute_unchecked(self) };
69-
// SAFETY: The original array was entirely initialized and the alive
69+
// SAFETY: The original array was entirely initialized and the the alive
7070
// range we're passing here represents that fact.
7171
let inner = unsafe { InnerSized::new_unchecked(IndexRange::zero_to(N), data) };
7272
IntoIter { inner }

library/std/src/sys/pal/windows/c/bindings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ ERROR_MARSHALL_OVERFLOW
14011401
ERROR_MAX_SESSIONS_REACHED
14021402
ERROR_MAX_THRDS_REACHED
14031403
ERROR_MCA_EXCEPTION
1404-
ERROR_MCA_OCCURRED
1404+
ERROR_MCA_OCCURED
14051405
ERROR_MEDIA_CHANGED
14061406
ERROR_MEDIA_CHECK
14071407
ERROR_MEMBER_IN_ALIAS

library/std/src/sys/pal/windows/c/windows_sys.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,7 +1793,7 @@ pub const ERROR_MARSHALL_OVERFLOW: WIN32_ERROR = 603u32;
17931793
pub const ERROR_MAX_SESSIONS_REACHED: WIN32_ERROR = 353u32;
17941794
pub const ERROR_MAX_THRDS_REACHED: WIN32_ERROR = 164u32;
17951795
pub const ERROR_MCA_EXCEPTION: WIN32_ERROR = 784u32;
1796-
pub const ERROR_MCA_OCCURRED: WIN32_ERROR = 651u32;
1796+
pub const ERROR_MCA_OCCURED: WIN32_ERROR = 651u32;
17971797
pub const ERROR_MEDIA_CHANGED: WIN32_ERROR = 1110u32;
17981798
pub const ERROR_MEDIA_CHECK: WIN32_ERROR = 679u32;
17991799
pub const ERROR_MEMBERS_PRIMARY_GROUP: WIN32_ERROR = 1374u32;

src/etc/htmldocck.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ def filter_line(line):
282282
]
283283

284284

285-
# To prevent duplicating the list of commands between `compiletest` and `htmldocck`, we put
285+
# To prevent duplicating the list of commmands between `compiletest` and `htmldocck`, we put
286286
# it into a common file which is included in rust code and parsed here.
287287
# FIXME: This setup is temporary until we figure out how to improve this situation.
288288
# See <https://github.com/rust-lang/rust/issues/125813#issuecomment-2141953780>.

src/librustdoc/passes/strip_hidden.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl DocFolder for Stripper<'_, '_> {
168168
self.update_retained = old;
169169
if ret.item_id == clean::ItemId::DefId(CRATE_DEF_ID.into()) {
170170
// We don't strip the current crate, even if it has `#[doc(hidden)]`.
171-
debug!("strip_hidden: Not stripping local crate");
171+
debug!("strip_hidden: Not strippping local crate");
172172
Some(ret)
173173
} else {
174174
Some(strip_item(ret))

src/tools/llvm-bitcode-linker/src/linker.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl Session {
6868
.arg("-o")
6969
.arg(&self.link_path)
7070
.output()
71-
.context("An error occurred when calling llvm-link. Make sure the llvm-tools component is installed.")?;
71+
.context("An error occured when calling llvm-link. Make sure the llvm-tools component is installed.")?;
7272

7373
if !llvm_link_output.status.success() {
7474
tracing::error!(
@@ -115,7 +115,7 @@ impl Session {
115115
}
116116

117117
let opt_output = opt_cmd.output().context(
118-
"An error occurred when calling opt. Make sure the llvm-tools component is installed.",
118+
"An error occured when calling opt. Make sure the llvm-tools component is installed.",
119119
)?;
120120

121121
if !opt_output.status.success() {
@@ -149,7 +149,7 @@ impl Session {
149149
.arg(&self.opt_path)
150150
.arg("-o").arg(&self.out_path)
151151
.output()
152-
.context("An error occurred when calling llc. Make sure the llvm-tools component is installed.")?;
152+
.context("An error occured when calling llc. Make sure the llvm-tools component is installed.")?;
153153

154154
if !lcc_output.status.success() {
155155
tracing::error!(

src/tools/miri/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ Definite bugs found:
579579
* [Occasional memory leak in `std::mpsc` channels](https://github.com/rust-lang/rust/issues/121582) (original code in [crossbeam](https://github.com/crossbeam-rs/crossbeam/pull/1084))
580580
* [Weak-memory-induced memory leak in Windows thread-local storage](https://github.com/rust-lang/rust/pull/124281)
581581
* [A bug in the new `RwLock::downgrade` implementation](https://rust-lang.zulipchat.com/#narrow/channel/269128-miri/topic/Miri.20error.20library.20test) (caught by Miri before it landed in the Rust repo)
582-
* [Mockall reading uninitialized memory when mocking `std::io::Read::read`, even if all expectations are satisfied](https://github.com/asomers/mockall/issues/647) (caught by Miri running Tokio's test suite)
582+
* [Mockall reading unintialized memory when mocking `std::io::Read::read`, even if all expectations are satisfied](https://github.com/asomers/mockall/issues/647) (caught by Miri running Tokio's test suite)
583583

584584
Violations of [Stacked Borrows] found that are likely bugs (but Stacked Borrows is currently just an experiment):
585585

src/tools/miri/src/borrow_tracker/tree_borrows/tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ where
396396
assert!(self.stack.is_empty());
397397
// First, handle accessed node. A bunch of things need to
398398
// be handled differently here compared to the further parents
399-
// of `accessed_node`.
399+
// of `accesssed_node`.
400400
{
401401
self.propagate_at(this, accessed_node, AccessRelatedness::This)?;
402402
if matches!(visit_children, ChildrenVisitMode::VisitChildrenOfAccessed) {

src/tools/miri/tests/pass-dep/libc/libc-epoll-no-blocking.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ fn test_event_overwrite() {
417417
check_epoll_wait::<8>(epfd, &[(expected_event, expected_value)]);
418418
}
419419

420-
// An epoll notification will be provided for every successful read in a socketpair.
420+
// An epoll notification will be provided for every succesful read in a socketpair.
421421
// This behaviour differs from the real system.
422422
fn test_socketpair_read() {
423423
// Create an epoll instance.

src/tools/miri/tests/pass/shims/x86/intrinsics-sha.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ unsafe fn test_sha256() {
152152
// This is the content that's being hashed - you can feed it to sha256sum and it'll output
153153
// the same hash (beware of newlines though).
154154
let first_block = *b"Rust is awesome!Rust is awesome!Rust is awesome!Rust is awesome!";
155-
// sha256 is finalized by appending 0x80, then zeros and finally the data length at the
155+
// sha256 is fianlized by appending 0x80, then zeros and finally the data lenght at the
156156
// end.
157157
let mut final_block = [0; 64];
158158
final_block[0] = 0x80;

src/tools/rust-analyzer/crates/stdx/src/assert.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
4444
/// Asserts that the condition is always true and returns its actual value.
4545
///
46-
/// If the condition is true does nothing and evaluates to true.
46+
/// If the condition is true does nothing and and evaluates to true.
4747
///
4848
/// If the condition is false:
4949
/// * panics if `force` feature or `debug_assertions` are enabled,
@@ -71,7 +71,7 @@ macro_rules! always {
7171

7272
/// Asserts that the condition is never true and returns its actual value.
7373
///
74-
/// If the condition is false does nothing and evaluates to false.
74+
/// If the condition is false does nothing and and evaluates to false.
7575
///
7676
/// If the condition is true:
7777
/// * panics if `force` feature or `debug_assertions` are enabled,

0 commit comments

Comments
 (0)