Auto merge of #151409 - GuillaumeGomez:rollup-bDqwVwM, r=GuillaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#147611 (Stabilize `-Zremap-path-scope`)
 - rust-lang/rust#149058 (FCW Lint when using an ambiguously glob imported trait)
 - rust-lang/rust#149644 (Create x86_64-unknown-linux-gnuasan target which enables ASAN by default)
 - rust-lang/rust#150524 (Test that -Zbuild-std=core works on a variety of profiles)
 - rust-lang/rust#151394 (Fix typos: 'occured' -> 'occurred' and 'non_existant' -> 'non_existent')
 - rust-lang/rust#151396 (`rustc_queries!`: Don't push the `(cache)` modifier twice)

r? @ghost

Author: bors

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<std::string> handle_execution_end();
 
     /***** Functions for handling events encountered during program execution. *****/

genmc-sys/src/lib.rs

@@ -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. *****/

src/concurrency/genmc/mod.rs

@@ -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.