Hygienic path for ::std::option::Option

dtolnay · Jun 20, 2022 · 95bb29c · 95bb29c
1 parent 7286307
commit 95bb29c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/format.rs b/src/format.rs
@@ -111,14 +111,14 @@
 macro_rules! format_ident {
     ($fmt:expr) => {
         $crate::format_ident_impl!([
-            ::std::option::Option::None,
+            $crate::__private::Option::None,
             $fmt
         ])
     };
 
     ($fmt:expr, $($rest:tt)*) => {
         $crate::format_ident_impl!([
-            ::std::option::Option::None,
+            $crate::__private::Option::None,
             $fmt
         ] $($rest)*)
     };
@@ -141,7 +141,7 @@ macro_rules! format_ident_impl {
     };
     ([$old:expr, $($fmt:tt)*] span = $span:expr, $($rest:tt)*) => {
         $crate::format_ident_impl!([
-            ::std::option::Option::Some::<$crate::__private::Span>($span),
+            $crate::__private::Option::Some::<$crate::__private::Span>($span),
             $($fmt)*
         ] $($rest)*)
     };

diff --git a/src/runtime.rs b/src/runtime.rs
@@ -5,6 +5,7 @@ use std::ops::BitOr;
 
 pub use proc_macro2::*;
 pub use std::format;
+pub use std::option::Option;
 
 pub struct HasIterator; // True
 pub struct ThereIsNoIteratorInRepetition; // False