Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/tools/llvm-bitcode-linker/src/linker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl Session {
.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!(
Expand Down Expand Up @@ -115,7 +115,7 @@ impl Session {
}

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() {
Expand Down Expand Up @@ -149,7 +149,7 @@ impl Session {
.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!(
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/genmc-sys/cpp/include/MiriInterface.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string> handle_execution_end();

/***** Functions for handling events encountered during program execution. *****/
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/genmc-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ mod ffi {
/// 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<CxxString>;

/***** Functions for handling events encountered during program execution. *****/
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/src/concurrency/genmc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ impl GenmcCtx {
/// 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.
Expand Down
2 changes: 1 addition & 1 deletion src/tools/tidy/src/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ impl RunningCheck {
}
}

/// Has an error already occured for this check?
/// Has an error already occurred for this check?
pub fn is_bad(&self) -> bool {
self.bad
}
Expand Down
6 changes: 3 additions & 3 deletions tests/rustdoc-html/intra-doc/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
//@ 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"]
#![expect(rustdoc::broken_intra_doc_links)]

//@ 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;
Loading