From eb56693a370df5bb60f58f73586cded6a641b0cc Mon Sep 17 00:00:00 2001
From: Smitty <me@smitop.com>
Date: Thu, 29 Jul 2021 13:00:55 -0400
Subject: Implement concat_bytes!

The tracking issue for this is #87555.
---
 library/std/src/lib.rs        | 9 +++++++++
 library/std/src/prelude/v1.rs | 9 +++++++++
 2 files changed, 18 insertions(+)

(limited to 'library/std/src')

diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 67846e78835..367f072ffc7 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -250,6 +250,7 @@
 #![feature(cfg_target_thread_local)]
 #![feature(char_error_internals)]
 #![feature(char_internals)]
+#![cfg_attr(not(bootstrap), feature(concat_bytes))]
 #![feature(concat_idents)]
 #![feature(const_cstr_unchecked)]
 #![feature(const_fn_floating_point_arithmetic)]
@@ -576,6 +577,14 @@ pub use core::{
     log_syntax, module_path, option_env, stringify, trace_macros,
 };
 
+#[unstable(
+    feature = "concat_bytes",
+    issue = "87555",
+    reason = "`concat_bytes` is not stable enough for use and is subject to change"
+)]
+#[cfg(not(bootstrap))]
+pub use core::concat_bytes;
+
 #[stable(feature = "core_primitive", since = "1.43.0")]
 pub use core::primitive;
 
diff --git a/library/std/src/prelude/v1.rs b/library/std/src/prelude/v1.rs
index 772044f0149..9b23aa37e31 100644
--- a/library/std/src/prelude/v1.rs
+++ b/library/std/src/prelude/v1.rs
@@ -45,6 +45,15 @@ pub use core::prelude::v1::{
     PartialOrd,
 };
 
+#[unstable(
+    feature = "concat_bytes",
+    issue = "87555",
+    reason = "`concat_bytes` is not stable enough for use and is subject to change"
+)]
+#[cfg(not(bootstrap))]
+#[doc(no_inline)]
+pub use core::prelude::v1::concat_bytes;
+
 #[unstable(
     feature = "asm",
     issue = "72016",
-- 
cgit 1.4.1-3-g733a5