From d3943b1863e47cc207820c9c0eda13fc045a805b Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Mon, 7 Oct 2024 00:18:41 -0500
Subject: [PATCH] Set edition to 2021 for all crates

---
 library/compiler-builtins/libm/Cargo.toml                       | 2 +-
 .../libm/crates/compiler-builtins-smoke-test/Cargo.toml         | 1 +
 .../libm/crates/compiler-builtins-smoke-test/src/lib.rs         | 2 ++
 library/compiler-builtins/libm/crates/libm-bench/Cargo.toml     | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/compiler-builtins/libm/Cargo.toml b/library/compiler-builtins/libm/Cargo.toml
index 712baee79a5b..181000f343e3 100644
--- a/library/compiler-builtins/libm/Cargo.toml
+++ b/library/compiler-builtins/libm/Cargo.toml
@@ -9,7 +9,7 @@ name = "libm"
 readme = "README.md"
 repository = "https://github.com/rust-lang/libm"
 version = "0.2.8"
-edition = "2018"
+edition = "2021"
 exclude = ["/ci/", "/.github/workflows/"]
 
 [features]
diff --git a/library/compiler-builtins/libm/crates/compiler-builtins-smoke-test/Cargo.toml b/library/compiler-builtins/libm/crates/compiler-builtins-smoke-test/Cargo.toml
index 481d386a4b22..4bc62304a9d6 100644
--- a/library/compiler-builtins/libm/crates/compiler-builtins-smoke-test/Cargo.toml
+++ b/library/compiler-builtins/libm/crates/compiler-builtins-smoke-test/Cargo.toml
@@ -2,6 +2,7 @@
 name = "cb"
 version = "0.1.0"
 authors = ["Jorge Aparicio <jorge@japaric.io>"]
+edition = "2021"
 
 [lib]
 test = false
diff --git a/library/compiler-builtins/libm/crates/compiler-builtins-smoke-test/src/lib.rs b/library/compiler-builtins/libm/crates/compiler-builtins-smoke-test/src/lib.rs
index ab744c45bcec..e65cb8da3c4f 100644
--- a/library/compiler-builtins/libm/crates/compiler-builtins-smoke-test/src/lib.rs
+++ b/library/compiler-builtins/libm/crates/compiler-builtins-smoke-test/src/lib.rs
@@ -2,6 +2,8 @@
 //!
 //! This is used to test that we can source import `libm` into the compiler-builtins crate.
 
+#![feature(core_intrinsics)]
+#![allow(internal_features)]
 #![allow(dead_code)]
 #![no_std]
 
diff --git a/library/compiler-builtins/libm/crates/libm-bench/Cargo.toml b/library/compiler-builtins/libm/crates/libm-bench/Cargo.toml
index ac9cb83a601e..282752c6183a 100644
--- a/library/compiler-builtins/libm/crates/libm-bench/Cargo.toml
+++ b/library/compiler-builtins/libm/crates/libm-bench/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libm-bench"
 version = "0.1.0"
 authors = ["Gonzalo Brito Gadeschi <gonzalobg88@gmail.com>"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [dependencies]