Unconditionally use MaybeUninit

This raises the minimum Rust version to 1.36.0, so this is
a breaking change.

Author: nox

.travis.yml

@@ -3,7 +3,7 @@ rust:
   - nightly
   - beta
   - stable
-  - 1.31.0
+  - 1.36.0
 
 script:
   - cargo build --verbose

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cssparser"
-version = "0.25.9"
+version = "0.26.0"
 authors = [ "Simon Sapin <[email protected]>" ]
 
 description = "Rust implementation of CSS Syntax Level 3"
@@ -19,7 +19,7 @@ difference = "2.0"
 encoding_rs = "0.8"
 
 [dependencies]
-cssparser-macros = {path = "./macros", version = "0.3.3"}
+cssparser-macros = {path = "./macros", version = "0.4.0"}
 dtoa-short = "0.3"
 heapsize = {version = ">= 0.3, < 0.5", optional = true}
 itoa = "0.4"

macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cssparser-macros"
-version = "0.3.6"
+version = "0.4.0"
 authors = ["Simon Sapin <[email protected]>"]
 description = "Procedural macros for cssparser"
 documentation = "https://docs.rs/cssparser-macros/"

src/macros.rs

@@ -111,41 +111,16 @@ macro_rules! ascii_case_insensitive_phf_map {
 macro_rules! cssparser_internal__to_lowercase {
     ($input: expr, $BUFFER_SIZE: expr => $output: ident) => {
         let mut buffer;
-        // Safety: `buffer` is only used in `_internal__to_lowercase`,
-        // which initializes with `copy_from_slice` the part of the buffer it uses,
-        // before it uses it.
         #[allow(unsafe_code)]
-        let buffer = unsafe { cssparser_internal__uninit!(buffer, $BUFFER_SIZE) };
+        let buffer = unsafe {
+            buffer = ::std::mem::MaybeUninit::<[u8; $BUFFER_SIZE]>::uninit();
+            &mut *(buffer.as_mut_ptr())
+        };
         let input: &str = $input;
         let $output = $crate::_internal__to_lowercase(buffer, input);
     };
 }
 
-#[cfg(has_std__mem__MaybeUninit)]
-#[macro_export]
-#[doc(hidden)]
-macro_rules! cssparser_internal__uninit {
-    ($buffer: ident, $BUFFER_SIZE: expr) => {
-        {
-            $buffer = ::std::mem::MaybeUninit::<[u8; $BUFFER_SIZE]>::uninit();
-            &mut *($buffer.as_mut_ptr())
-        }
-    }
-}
-
-// FIXME: remove this when we require Rust 1.36
-#[cfg(not(has_std__mem__MaybeUninit))]
-#[macro_export]
-#[doc(hidden)]
-macro_rules! cssparser_internal__uninit {
-    ($buffer: ident, $BUFFER_SIZE: expr) => {
-        {
-            $buffer = ::std::mem::uninitialized::<[u8; $BUFFER_SIZE]>();
-            &mut $buffer
-        }
-    }
-}
-
 /// Implementation detail of match_ignore_ascii_case! and ascii_case_insensitive_phf_map! macros.
 ///
 /// **This function is not part of the public API. It can change or be removed between any verisons.**