diff --git a/src/tools/llvm-bitcode-linker/src/linker.rs b/src/tools/llvm-bitcode-linker/src/linker.rs index dafd847e7680..e682aecbbeed 100644 --- a/src/tools/llvm-bitcode-linker/src/linker.rs +++ b/src/tools/llvm-bitcode-linker/src/linker.rs @@ -68,7 +68,7 @@ fn link(&mut self) -> anyhow::Result<()> { .arg("-o") .arg(&self.link_path) .output() - .context("An error occured when calling llvm-link. Make sure the llvm-tools component is installed.")?; + .context("An error occurred when calling llvm-link. Make sure the llvm-tools component is installed.")?; if !llvm_link_output.status.success() { tracing::error!( @@ -115,7 +115,7 @@ fn optimize(&mut self, optimization: Optimization, mut debug: bool) -> anyhow::R } let opt_output = opt_cmd.output().context( - "An error occured when calling opt. Make sure the llvm-tools component is installed.", + "An error occurred when calling opt. Make sure the llvm-tools component is installed.", )?; if !opt_output.status.success() { @@ -149,7 +149,7 @@ fn compile(&mut self) -> anyhow::Result<()> { .arg(&self.opt_path) .arg("-o").arg(&self.out_path) .output() - .context("An error occured when calling llc. Make sure the llvm-tools component is installed.")?; + .context("An error occurred when calling llc. Make sure the llvm-tools component is installed.")?; if !lcc_output.status.success() { tracing::error!( diff --git a/src/tools/miri/genmc-sys/cpp/include/MiriInterface.hpp b/src/tools/miri/genmc-sys/cpp/include/MiriInterface.hpp index b6b7b06509a5..8110c8d24c59 100644 --- a/src/tools/miri/genmc-sys/cpp/include/MiriInterface.hpp +++ b/src/tools/miri/genmc-sys/cpp/include/MiriInterface.hpp @@ -79,7 +79,7 @@ struct MiriGenmcShim : private GenMCDriver { void handle_execution_start(); // This function must be called at the end of any execution, even if an error was found // during the execution. - // Returns `null`, or a string containing an error message if an error occured. + // Returns `null`, or a string containing an error message if an error occurred. std::unique_ptr handle_execution_end(); /***** Functions for handling events encountered during program execution. *****/ diff --git a/src/tools/miri/genmc-sys/src/lib.rs b/src/tools/miri/genmc-sys/src/lib.rs index b3a9880211de..26de80f295d3 100644 --- a/src/tools/miri/genmc-sys/src/lib.rs +++ b/src/tools/miri/genmc-sys/src/lib.rs @@ -379,7 +379,7 @@ unsafe fn create_handle( /// This function must be called at the start of any execution, before any events are reported to GenMC. fn handle_execution_start(self: Pin<&mut MiriGenmcShim>); /// This function must be called at the end of any execution, even if an error was found during the execution. - /// Returns `null`, or a string containing an error message if an error occured. + /// Returns `null`, or a string containing an error message if an error occurred. fn handle_execution_end(self: Pin<&mut MiriGenmcShim>) -> UniquePtr; /***** Functions for handling events encountered during program execution. *****/ diff --git a/src/tools/miri/src/concurrency/genmc/mod.rs b/src/tools/miri/src/concurrency/genmc/mod.rs index 36b1d2afade4..740553ab85d6 100644 --- a/src/tools/miri/src/concurrency/genmc/mod.rs +++ b/src/tools/miri/src/concurrency/genmc/mod.rs @@ -220,7 +220,7 @@ fn prepare_next_execution(&self) { /// Don't call this function if an error was found. /// /// GenMC detects certain errors only when the execution ends. - /// If an error occured, a string containing a short error description is returned. + /// If an error occurred, a string containing a short error description is returned. /// /// GenMC currently doesn't return an error in all cases immediately when one happens. /// This function will also check for those, and return their error description. diff --git a/src/tools/tidy/src/diagnostics.rs b/src/tools/tidy/src/diagnostics.rs index 88816b5abeff..6f53f2fff1a4 100644 --- a/src/tools/tidy/src/diagnostics.rs +++ b/src/tools/tidy/src/diagnostics.rs @@ -213,7 +213,7 @@ pub fn verbose_msg(&mut self, msg: T) { } } - /// Has an error already occured for this check? + /// Has an error already occurred for this check? pub fn is_bad(&self) -> bool { self.bad } diff --git a/tests/rustdoc-html/intra-doc/deps.rs b/tests/rustdoc-html/intra-doc/deps.rs index fd40b8326d0f..1670a2d8fe7b 100644 --- a/tests/rustdoc-html/intra-doc/deps.rs +++ b/tests/rustdoc-html/intra-doc/deps.rs @@ -6,7 +6,7 @@ //@ compile-flags: --extern-html-root-url=empty=https://empty.example/ // This one is to ensure that we don't link to any item we see which has // an external html root URL unless it actually exists. -//@ compile-flags: --extern-html-root-url=non_existant=https://non-existant.example/ +//@ compile-flags: --extern-html-root-url=non_existent=https://non-existent.example/ //@ aux-build: empty.rs #![crate_name = "foo"] @@ -14,10 +14,10 @@ //@ has 'foo/index.html' //@ has - '//a[@href="https://empty.example/empty/index.html"]' 'empty' -// There should only be one intra doc links, we should not link `non_existant`. +// There should only be one intra doc links, we should not link `non_existent`. //@ count - '//*[@class="docblock"]//a' 1 //! [`empty`] //! -//! [`non_existant`] +//! [`non_existent`] extern crate empty;