From ef0adaf4b47441f709783a7370cb4d63ab19d1a1 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Thu, 6 Aug 2020 12:40:58 -0700
Subject: [PATCH 1/2] Add a feature to explicitly enable "std"

If you know you need "std", e.g. relying on default `S = RandomState`,
then you can enable this feature to force it on, bypassing target
detection. This may help scenarios where `autocfg` fails detection, like
issue #144, but at the very least it will speed up the build script by
avoiding extra `rustc` invocations.
---
 .travis.yml | 3 +++
 Cargo.toml  | 3 +++
 build.rs    | 7 +++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a7ead00..0bb2653b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ matrix:
     - rust: stable
       env:
        - FEATURES='rayon'
+    - rust: stable
+      env:
+       - FEATURES='std'
     - rust: beta
     - rust: nightly
       env:
diff --git a/Cargo.toml b/Cargo.toml
index 5823a0f4..70b97845 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,6 +53,9 @@ fxhash = "0.2.1"
 # Serialization with serde 1.0
 serde-1 = ["serde"]
 
+# Force the use of `std`, bypassing target detection.
+std = []
+
 # for testing only, of course
 test_low_transition_point = []
 test_debug = []
diff --git a/build.rs b/build.rs
index 645c0f1c..9f9fa054 100644
--- a/build.rs
+++ b/build.rs
@@ -1,5 +1,8 @@
 fn main() {
-    let ac = autocfg::new();
-    ac.emit_sysroot_crate("std");
+    // If "std" is explicitly requested, don't bother probing the target for it.
+    match std::env::var_os("CARGO_FEATURE_STD") {
+        Some(_) => autocfg::emit("has_std"),
+        None => autocfg::new().emit_sysroot_crate("std"),
+    }
     autocfg::rerun_path("build.rs");
 }

From 4de0dcf4b46ae22cfa7f7b430ddf7171cbf61c35 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Tue, 1 Sep 2020 12:42:55 -0700
Subject: [PATCH 2/2] Release 1.5.2

---
 Cargo.toml | 2 +-
 README.rst | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 70b97845..7639106f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "indexmap"
 edition = "2018"
-version = "1.5.1"
+version = "1.5.2"
 authors = [
 "bluss",
 "Josh Stone <cuviper@gmail.com>"
diff --git a/README.rst b/README.rst
index 5fbab927..a935394b 100644
--- a/README.rst
+++ b/README.rst
@@ -66,6 +66,14 @@ which is roughly:
 Recent Changes
 ==============
 
+- 1.5.2
+
+  - The new "std" feature will force the use of ``std`` for users that explicitly
+    want the default ``S = RandomState``, bypassing the autodetection added in 1.3.0,
+    by @cuviper in PR 145_.
+
+.. _145: https://github.com/bluss/indexmap/pull/145
+
 - 1.5.1
 
   - Values can now be indexed by their ``usize`` position by @cuviper in PR 132_.