Merge pull request #496 from KodrAus/cargo/0.4.16

Prepare for 0.4.16 release

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [0.4.16] - 2022-03-22
+
+* Fix a conflict with unqualified `Option` use in macros.
+
 ## [0.4.15] - 2022-02-23
 
 * Silence a warning about the deprecated `spin_loop_hint`.
@@ -211,7 +215,8 @@ version using log 0.4.x to avoid losing module and file information.
 
 Look at the [release tags] for information about older releases.
 
-[Unreleased]: https://github.com/rust-lang-nursery/log/compare/0.4.15...HEAD
+[Unreleased]: https://github.com/rust-lang-nursery/log/compare/0.4.16...HEAD
+[0.4.16]: https://github.com/rust-lang-nursery/log/compare/0.4.15...0.4.16
 [0.4.15]: https://github.com/rust-lang-nursery/log/compare/0.4.13...0.4.15
 [0.4.14]: https://github.com/rust-lang-nursery/log/compare/0.4.13...0.4.14
 [0.4.13]: https://github.com/rust-lang-nursery/log/compare/0.4.11...0.4.13

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "log"
-version = "0.4.15" # remember to update html_root_url
+version = "0.4.16" # remember to update html_root_url
 authors = ["The Rust Project Developers"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"

src/lib.rs

@@ -313,7 +313,7 @@
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
     html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://docs.rs/log/0.4.15"
+    html_root_url = "https://docs.rs/log/0.4.16"
 )]
 #![warn(missing_docs)]
 #![deny(missing_debug_implementations, unconditional_recursion)]
@@ -1625,6 +1625,12 @@ pub fn __private_api_enabled(level: Level, target: &str) -> bool {
     logger().enabled(&Metadata::builder().level(level).target(target).build())
 }
 
+// WARNING: this is not part of the crate's public API and is subject to change at any time
+#[doc(hidden)]
+pub mod __private_api {
+    pub use std::option::Option;
+}
+
 /// The statically resolved maximum log level.
 ///
 /// See the crate level documentation for information on how to configure this.

src/macros.rs

@@ -37,7 +37,7 @@ macro_rules! log {
                 __log_format_args!($($arg)+),
                 lvl,
                 &($target, __log_module_path!(), __log_file!(), __log_line!()),
-                std::option::Option::Some(&[$((__log_key!($key), &$value)),+])
+                $crate::__private_api::Option::Some(&[$((__log_key!($key), &$value)),+])
             );
         }
     });
@@ -50,7 +50,7 @@ macro_rules! log {
                 __log_format_args!($($arg)+),
                 lvl,
                 &($target, __log_module_path!(), __log_file!(), __log_line!()),
-                std::option::Option::None,
+                $crate::__private_api::Option::None,
             );
         }
     });

tests/macros.rs

@@ -225,6 +225,6 @@ enum Type {
 
 #[test]
 fn regression_issue_494() {
-    use Type::*;
+    use self::Type::*;
     all_log_macros!("some message: {:?}, {:?}", None, Some);
 }