Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/msrv.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Rust 1.57
name: Rust 1.60

on:
push:
Expand All @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: dtolnay/rust-toolchain@1.57
- uses: dtolnay/rust-toolchain@1.60
- name: Run tests (no default features)
run: cargo test --no-default-features
- name: Run tests (default features)
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
can be used with serde's `deserialize_with` attribute.
* The `int!` and `uint!` macros now support arbitrary const expressions, not just literals
* `Int::new` and `UInt::new` are now const
* The minimum supported rust version is raised to 1.57.
* The minimum supported rust version is raised to 1.60.

# 0.2.2

Expand Down
18 changes: 10 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ readme = "README.md"
repository = "https://github.com/ruma/js_int"
keywords = ["integer", "no_std"]
categories = ["no-std"]
rust-version = "1.57.0"
rust-version = "1.60.0"

[dependencies.serde]
version = "1.0"
[dependencies.serde_core]
version = "1.0.220"
optional = true
default-features = false

[features]
default = ["std"]
"rust_1.81" = []
std = []
serde = ["dep:serde_core"]
2 changes: 1 addition & 1 deletion src/int.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
UInt, MAX_SAFE_UINT,
};
#[cfg(feature = "serde")]
use serde::{
use serde_core::{
de::{Error as _, Unexpected},
Deserialize, Deserializer, Serialize, Serializer,
};
Expand Down
2 changes: 1 addition & 1 deletion src/uint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
MAX_SAFE_INT,
};
#[cfg(feature = "serde")]
use serde::{
use serde_core::{
de::{Error as _, Unexpected},
Deserialize, Deserializer, Serialize, Serializer,
};
Expand Down
6 changes: 3 additions & 3 deletions tests/int.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use crate::test_serializer::{Number, TestSerializer};
use core::convert::TryFrom;
use js_int::{int, Int};
use serde::{de::IntoDeserializer, Deserialize, Serialize};
use serde_core::{de::IntoDeserializer, Deserialize, Serialize};

mod test_serializer;

Expand Down Expand Up @@ -66,13 +66,13 @@ fn deserialize_integral_float() {

fn deserialize_via_float<'de, Value: IntoDeserializer<'de>>(
value: Value,
) -> Result<Int, serde::de::value::Error> {
) -> Result<Int, serde_core::de::value::Error> {
Int::deserialize_via_float(value.into_deserializer())
}
}

fn deserialize_from<'de, Value: IntoDeserializer<'de>>(
value: Value,
) -> Result<Int, serde::de::value::Error> {
) -> Result<Int, serde_core::de::value::Error> {
Int::deserialize(value.into_deserializer())
}
4 changes: 2 additions & 2 deletions tests/test_serializer.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![cfg(feature = "serde")]
use serde::{
use serde_core::{
ser::{
SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,
SerializeTupleStruct, SerializeTupleVariant,
Expand Down Expand Up @@ -33,7 +33,7 @@ impl From<&'static str> for Error {
}
}

impl serde::ser::Error for Error {
impl serde_core::ser::Error for Error {
fn custom<T>(message: T) -> Self
where
T: Display,
Expand Down
6 changes: 3 additions & 3 deletions tests/uint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use crate::test_serializer::{Number, TestSerializer};
use core::convert::TryFrom;
use js_int::{uint, UInt};
use serde::{de::IntoDeserializer, Deserialize, Serialize};
use serde_core::{de::IntoDeserializer, Deserialize, Serialize};

mod test_serializer;

Expand Down Expand Up @@ -58,13 +58,13 @@ fn deserialize_integral_float() {

fn deserialize_via_float<'de, Value: IntoDeserializer<'de>>(
value: Value,
) -> Result<UInt, serde::de::value::Error> {
) -> Result<UInt, serde_core::de::value::Error> {
UInt::deserialize_via_float(value.into_deserializer())
}
}

fn deserialize_from<'de, Value: IntoDeserializer<'de>>(
value: Value,
) -> Result<UInt, serde::de::value::Error> {
) -> Result<UInt, serde_core::de::value::Error> {
UInt::deserialize(value.into_deserializer())
}