Skip to content

Commit 1ae74b3

Browse files
Rollup merge of rust-lang#151394 - fix-typos-occured-occurred, r=GuillaumeGomez
Fix typos: 'occured' -> 'occurred' and 'non_existant' -> 'non_existent'
2 parents 79c02e2 + ac505d7 commit 1ae74b3

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

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 occured when calling llvm-link. Make sure the llvm-tools component is installed.")?;
71+
.context("An error occurred 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 occured when calling opt. Make sure the llvm-tools component is installed.",
118+
"An error occurred 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 occured when calling llc. Make sure the llvm-tools component is installed.")?;
152+
.context("An error occurred when calling llc. Make sure the llvm-tools component is installed.")?;
153153

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

src/tools/miri/genmc-sys/cpp/include/MiriInterface.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ struct MiriGenmcShim : private GenMCDriver {
7979
void handle_execution_start();
8080
// This function must be called at the end of any execution, even if an error was found
8181
// during the execution.
82-
// Returns `null`, or a string containing an error message if an error occured.
82+
// Returns `null`, or a string containing an error message if an error occurred.
8383
std::unique_ptr<std::string> handle_execution_end();
8484

8585
/***** Functions for handling events encountered during program execution. *****/

src/tools/miri/genmc-sys/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ mod ffi {
379379
/// This function must be called at the start of any execution, before any events are reported to GenMC.
380380
fn handle_execution_start(self: Pin<&mut MiriGenmcShim>);
381381
/// This function must be called at the end of any execution, even if an error was found during the execution.
382-
/// Returns `null`, or a string containing an error message if an error occured.
382+
/// Returns `null`, or a string containing an error message if an error occurred.
383383
fn handle_execution_end(self: Pin<&mut MiriGenmcShim>) -> UniquePtr<CxxString>;
384384

385385
/***** Functions for handling events encountered during program execution. *****/

src/tools/miri/src/concurrency/genmc/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ impl GenmcCtx {
220220
/// Don't call this function if an error was found.
221221
///
222222
/// GenMC detects certain errors only when the execution ends.
223-
/// If an error occured, a string containing a short error description is returned.
223+
/// If an error occurred, a string containing a short error description is returned.
224224
///
225225
/// GenMC currently doesn't return an error in all cases immediately when one happens.
226226
/// This function will also check for those, and return their error description.

src/tools/tidy/src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ impl RunningCheck {
213213
}
214214
}
215215

216-
/// Has an error already occured for this check?
216+
/// Has an error already occurred for this check?
217217
pub fn is_bad(&self) -> bool {
218218
self.bad
219219
}

tests/rustdoc-html/intra-doc/deps.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
//@ compile-flags: --extern-html-root-url=empty=https://empty.example/
77
// This one is to ensure that we don't link to any item we see which has
88
// an external html root URL unless it actually exists.
9-
//@ compile-flags: --extern-html-root-url=non_existant=https://non-existant.example/
9+
//@ compile-flags: --extern-html-root-url=non_existent=https://non-existent.example/
1010
//@ aux-build: empty.rs
1111

1212
#![crate_name = "foo"]
1313
#![expect(rustdoc::broken_intra_doc_links)]
1414

1515
//@ has 'foo/index.html'
1616
//@ has - '//a[@href="https://empty.example/empty/index.html"]' 'empty'
17-
// There should only be one intra doc links, we should not link `non_existant`.
17+
// There should only be one intra doc links, we should not link `non_existent`.
1818
//@ count - '//*[@class="docblock"]//a' 1
1919
//! [`empty`]
2020
//!
21-
//! [`non_existant`]
21+
//! [`non_existent`]
2222
2323
extern crate empty;

0 commit comments

Comments
 (0)