Rollup merge of #85633 - lqd:stackless_span_stacks, r=oli-obk

[rust.git] / library / core / src / macros / mod.rs

diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs
index 5d9b0f80d3a6f3ebcfd9f9b454963dfaaa25072e..feadf5b4c7c9a72d6e081bd644f34bef920bf1b3 100644 (file)
--- a/library/core/src/macros/mod.rs
+++ b/library/core/src/macros/mod.rs
@@ -595,7 +595,7 @@ macro_rules! unreachable {
 /// Indicates unimplemented code by panicking with a message of "not implemented".
 ///
 /// This allows your code to type-check, which is useful if you are prototyping or
-/// implementing a trait that requires multiple methods which you don't plan of using all of.
+/// implementing a trait that requires multiple methods which you don't plan to use all of.
 ///
 /// The difference between `unimplemented!` and [`todo!`] is that while `todo!`
 /// conveys an intent of implementing the functionality later and the message is "not yet
@@ -1358,7 +1358,10 @@ macro_rules! llvm_asm {
     #[rustc_builtin_macro]
     #[macro_export]
     macro_rules! global_asm {
-        ("assembly") => {
+        ("assembly template",
+            $(operands,)*
+            $(options($(option),*))?
+        ) => {
             /* compiler built-in */
         };
     }