From 6a48d558456cc272ffc7b9ed9c7fa439e4f3cfd7 Mon Sep 17 00:00:00 2001 From: kirk Date: Wed, 11 Dec 2024 15:09:30 +0000 Subject: [PATCH] bump msrv and crate versions, remove std::error references --- Cargo.toml | 6 +++--- README.md | 4 ++-- derive/Cargo.toml | 4 ++-- src/serde_bin.rs | 5 ----- src/serde_json.rs | 7 +------ src/serde_ron.rs | 7 +------ src/toml.rs | 7 +------ 7 files changed, 10 insertions(+), 30 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b9a076e..95f424b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "nanoserde" -version = "0.2.0-beta.2" +version = "0.2.0" authors = ["makepad ", "Fedor "] license = "MIT OR Apache-2.0" description = """Serialization library with zero dependencies. Supports Binary, JSON, RON and TOML.""" edition = "2021" -rust-version = "1.71.1" +rust-version = "1.81.0" repository = "https://github.com/not-fl3/nanoserde" [features] @@ -20,4 +20,4 @@ toml = [] std = [] [dependencies] -nanoserde-derive = { path = "derive", version = "=0.2.0-beta.2", optional = true } +nanoserde-derive = { path = "derive", version = "=0.2.0", optional = true } diff --git a/README.md b/README.md index a9c621f..76cf52b 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ No more syn, proc_macro2 or quote in the build tree! ``` > cargo tree -nanoserde v0.1.0 (/../nanoserde) -└── nanoserde-derive v0.1.0 (/../nanoserde/derive) +nanoserde v0.2.0 (/../nanoserde) +└── nanoserde-derive v0.2.0 (/../nanoserde/derive) ``` ## Example: diff --git a/derive/Cargo.toml b/derive/Cargo.toml index da83098..e5bc311 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "nanoserde-derive" -version = "0.2.0-beta.2" +version = "0.2.0" authors = ["Makepad ", "Fedor "] edition = "2021" -rust-version = "1.78.0" +rust-version = "1.81.0" description = "Fork of makepad-tinyserde derive without any external dependencies" license = "MIT" diff --git a/src/serde_bin.rs b/src/serde_bin.rs index 8a7e3b1..20c4a9d 100644 --- a/src/serde_bin.rs +++ b/src/serde_bin.rs @@ -1,10 +1,5 @@ use core::convert::TryInto; - -// remove this after 1.81 is live -#[cfg(not(feature = "std"))] use core::error::Error; -#[cfg(feature = "std")] -use std::error::Error; use alloc::borrow::ToOwned; use alloc::boxed::Box; diff --git a/src/serde_json.rs b/src/serde_json.rs index 0f6306d..a9ac079 100644 --- a/src/serde_json.rs +++ b/src/serde_json.rs @@ -1,10 +1,5 @@ -use core::str::Chars; - -// remove this after 1.81 is msrv -#[cfg(not(feature = "std"))] use core::error::Error; -#[cfg(feature = "std")] -use std::error::Error; +use core::str::Chars; use alloc::boxed::Box; use alloc::collections::{BTreeMap, BTreeSet, LinkedList}; diff --git a/src/serde_ron.rs b/src/serde_ron.rs index ff5a2b9..c2c2490 100644 --- a/src/serde_ron.rs +++ b/src/serde_ron.rs @@ -1,10 +1,5 @@ -use core::str::Chars; - -// remove this after 1.81 is live -#[cfg(not(feature = "std"))] use core::error::Error; -#[cfg(feature = "std")] -use std::error::Error; +use core::str::Chars; use alloc::boxed::Box; use alloc::collections::{BTreeMap, BTreeSet, LinkedList}; diff --git a/src/toml.rs b/src/toml.rs index 731ceed..b512c45 100644 --- a/src/toml.rs +++ b/src/toml.rs @@ -1,10 +1,5 @@ -use core::str::Chars; - -// remove this after 1.81 is live -#[cfg(not(feature = "std"))] use core::error::Error; -#[cfg(feature = "std")] -use std::error::Error; +use core::str::Chars; use alloc::format; use alloc::string::{String, ToString};