From a782f144f4ebd8a5b4d85d5cdd052e5d7d747bfa Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 4 Nov 2021 08:37:34 -0700 Subject: [PATCH] Rename rustc-std-workspace-core to core in Cargo.toml instead of lib.rs. --- Cargo.toml | 4 ++-- gen/src/main.rs | 2 +- src/lib.rs | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 36dbd89..c77e960 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ categories = ["external-ffi-bindings"] exclude = ["gen"] [dependencies] -rustc-std-workspace-core = { version = "1.0.0", optional = true } +core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" } compiler_builtins = { version = '0.1.49', optional = true } [package.metadata.docs.rs] @@ -35,4 +35,4 @@ v5_11 = [] default = ["std", "general", "errno"] std = [] no_std = [] -rustc-dep-of-std = ["rustc-std-workspace-core", "compiler_builtins", "no_std"] +rustc-dep-of-std = ["core", "compiler_builtins", "no_std"] diff --git a/gen/src/main.rs b/gen/src/main.rs index 50be646..881f746 100644 --- a/gen/src/main.rs +++ b/gen/src/main.rs @@ -242,7 +242,7 @@ fn main() { writeln!(cargo_toml, "default = [\"std\", {}]", DEFAULT_FEATURES).unwrap(); writeln!(cargo_toml, "std = []").unwrap(); writeln!(cargo_toml, "no_std = []").unwrap(); - writeln!(cargo_toml, "rustc-dep-of-std = [\"rustc-std-workspace-core\", \"compiler_builtins\", \"no_std\"]").unwrap(); + writeln!(cargo_toml, "rustc-dep-of-std = [\"core\", \"compiler_builtins\", \"no_std\"]").unwrap(); // Reset the `linux` directory back to the original branch. git_checkout(LINUX_VERSIONS[0]); diff --git a/src/lib.rs b/src/lib.rs index 462c615..2778f2f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,6 @@ #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] #![cfg_attr(not(feature = "std"), no_std)] -#[cfg(feature = "rustc-dep-of-std")] -extern crate rustc_std_workspace_core as core; - #[cfg(feature = "std")] pub use std::os::raw as ctypes;