Merge pull request #10 from jymchng/feature/feature-gates

Feature/feature gates
jymchng · Apr 2, 2024 · c3cb1d6 · c3cb1d6
2 parents e8e3144 + ede316e
commit c3cb1d6
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 1,292 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "typenum-consts"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 authors = ["Jim Chng <[email protected]>"]
 exclude = [
@@ -37,7 +37,7 @@ quote = "1.0.35"
 syn = { version = "2.0.53", features = ["extra-traits", "full"] }
 typenum = "1.17.0"
 dotenv = "0.15.0"
-peekmore = "1.0.0"
+rsc = "3.0.0"
 
 [dev-dependencies]
 trybuild = "1.0.90"

diff --git a/README.md b/README.md
@@ -113,18 +113,6 @@ assert_type_eq!(E, P69);
 - [ ] Feature gate evaluation of mathematical expressions and reading from environment variables.
 - [ ] Enable testing for Rust version 1.70.
 
-# Vendored Crates
-
-## [`rsc`](https://github.com/fivemoreminix/rsc/commit/67c4ddffbe45a30de0fd696c569de885bfd4e9b4) version 3.0.0
-
-Reasons for vendoring `rsc`.
-
-1. As of 28 March 2024, there is a version 3.0.0 of the crate on the GitHub [repository](https://github.com/fivemoreminix/rsc/commit/67c4ddffbe45a30de0fd696c569de885bfd4e9b4) but without a corresponding crate on `crates.io`.
-2. Easier to implement `Num` for `isize` with vendoring.
-3. `typenum-const needs a mathematical expression evaluator.
-4. Its [license](https://github.com/fivemoreminix/rsc/tree/67c4ddffbe45a30de0fd696c569de885bfd4e9b4?tab=readme-ov-file#license) allows for 'usage without attribution'. Anyway, `src/vendors/rsc/Cargo.toml.vendored` is the original `Cargo.toml` file found in the repository.
-5. Thanks to [Luke Wilson](https://github.com/fivemoreminix).
-
 ## License
 
 Licensed under either of

diff --git a/src/ast_macro.rs b/src/ast_macro.rs
@@ -15,7 +15,7 @@ const CARGO_ENV_DIRS: [&str; 3] = [CARGO_BUILD_TARGET_DIR, CARGO_MANIFEST_DIR, C
 impl EnvArgs {
     fn check_string_cannot_be_empty(
         &self,
-        string: &String,
+        string: &str,
         error_span: Span,
         name: &str,
     ) -> Result<()> {

diff --git a/src/lib.rs b/src/lib.rs
@@ -7,21 +7,20 @@ use crate::ast::{
 };
 use crate::macros::debug_eprintln;
 use proc_macro::{self, TokenStream};
+#[allow(clippy::all)]
+use rsc;
 use tnconst_impl::{
     nconst_impl_lit_integer, nconst_impl_math_exprs, pconst_impl_lit_integer,
     pconst_impl_math_exprs, tnconst_impl_lit_integer, tnconst_impl_math_exprs,
     uconst_impl_lit_integer, uconst_impl_math_exprs,
 };
-#[allow(clippy::all)]
-use vendors::rsc;
 
 mod ast;
 mod ast_macro;
 mod exprs_impl;
 mod macros;
 mod tnconst_impl;
 mod uconst_impl;
-mod vendors;
 
 /// [`uconst!`] is a procedural macro that converts a literal integer or an expression into a [`typenum`]'s type-level unsigned integer (i.e. the type that implements the [`typenum::Unsigned`] trait).
 ///

diff --git a/src/vendors/mod.rs b/src/vendors/mod.rs
diff --git a/src/vendors/rsc/.gitignore b/src/vendors/rsc/.gitignore
diff --git a/src/vendors/rsc/CHANGELOG.md b/src/vendors/rsc/CHANGELOG.md
diff --git a/src/vendors/rsc/Cargo.toml.vendored b/src/vendors/rsc/Cargo.toml.vendored
diff --git a/src/vendors/rsc/LICENSE b/src/vendors/rsc/LICENSE
diff --git a/src/vendors/rsc/README.md b/src/vendors/rsc/README.md