Reword purpose description of noreturn in naked function

rust-lang · Apr 1, 2022 · f793b69 · f793b69
1 parent b657cb5
commit f793b69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/compiler/rustc_passes/src/naked_functions.rs b/compiler/rustc_passes/src/naked_functions.rs
@@ -289,7 +289,7 @@ impl<'tcx> CheckInlineAssembly<'tcx> {
             .span_suggestion(
                 last_span,
                 "consider specifying that the asm block is responsible \
-                for returning, if desired",
+                for returning from the function",
                 String::from(", options(noreturn)"),
                 Applicability::MachineApplicable,
             )

diff --git a/src/test/ui/asm/naked-functions.stderr b/src/test/ui/asm/naked-functions.stderr
@@ -98,7 +98,7 @@ LL | |          sym G,
 LL | |     );
    | |_____^
    |
-help: consider specifying that the asm block is responsible for returning, if desired
+help: consider specifying that the asm block is responsible for returning from the function
    |
 LL |          sym G, options(noreturn),
    |               +++++++++++++++++++
@@ -137,7 +137,7 @@ error[E0787]: asm in naked functions must use `noreturn` option
 LL |     asm!("");
    |     ^^^^^^^^
    |
-help: consider specifying that the asm block is responsible for returning, if desired
+help: consider specifying that the asm block is responsible for returning from the function
    |
 LL |     asm!("", options(noreturn));
    |            +++++++++++++++++++
@@ -148,7 +148,7 @@ error[E0787]: asm in naked functions must use `noreturn` option
 LL |     asm!("");
    |     ^^^^^^^^
    |
-help: consider specifying that the asm block is responsible for returning, if desired
+help: consider specifying that the asm block is responsible for returning from the function
    |
 LL |     asm!("", options(noreturn));
    |            +++++++++++++++++++
@@ -159,7 +159,7 @@ error[E0787]: asm in naked functions must use `noreturn` option
 LL |     asm!("");
    |     ^^^^^^^^
    |
-help: consider specifying that the asm block is responsible for returning, if desired
+help: consider specifying that the asm block is responsible for returning from the function
    |
 LL |     asm!("", options(noreturn));
    |            +++++++++++++++++++
@@ -219,7 +219,7 @@ error[E0787]: asm in naked functions must use `noreturn` option
 LL |     asm!("", options(readonly, nostack), options(pure));
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-help: consider specifying that the asm block is responsible for returning, if desired
+help: consider specifying that the asm block is responsible for returning from the function
    |
 LL |     asm!("", options(noreturn), options(readonly, nostack), options(pure));
    |            +++++++++++++++++++