From 5d831a19e0bf00f3d1136ff35d3bd4b2711e3932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dj8yf0=CE=BCl?= Date: Mon, 18 Dec 2023 22:01:13 +0200 Subject: [PATCH 1/2] fix: remove leftover `near_sdk::__private::schemars` --- near-sdk-macros/src/core_impl/abi/abi_generator.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/near-sdk-macros/src/core_impl/abi/abi_generator.rs b/near-sdk-macros/src/core_impl/abi/abi_generator.rs index ed065861f..4089863ce 100644 --- a/near-sdk-macros/src/core_impl/abi/abi_generator.rs +++ b/near-sdk-macros/src/core_impl/abi/abi_generator.rs @@ -22,7 +22,7 @@ pub fn generate(i: &ItemImplInfo) -> TokenStream2 { pub extern "C" fn #near_abi_symbol() -> (*const u8, usize) { use ::std::string::String; - let mut gen = ::near_sdk::__private::schemars::gen::SchemaGenerator::default(); + let mut gen = ::near_sdk::schemars::gen::SchemaGenerator::default(); let functions = vec![#(#functions),*]; let mut data = ::std::mem::ManuallyDrop::new( ::near_sdk::serde_json::to_vec(&::near_sdk::__private::ChunkedAbiEntry::new( From 30110e51e48ead24d956a0e58797e54364ce6f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dj8yf0=CE=BCl?= Date: Tue, 19 Dec 2023 13:31:06 +0200 Subject: [PATCH 2/2] ci: fix ci on 1.69 test --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e32c5bfdd..eab7d4661 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,13 +23,15 @@ jobs: toolchain: ${{ matrix.toolchain }} default: true target: wasm32-unknown-unknown - - name: downgrade `anstyle`,`anstyle-parse`,`clap`,`clap_lex` crates to support older Rust toolchain + - name: downgrade `anstyle`,`anstyle-parse`,`anstyle-query`,`clap`,`clap_lex`, `home` crates to support older Rust toolchain if: matrix.toolchain == '1.69.0' run: | cargo update -p anstyle --precise 1.0.2 + cargo update -p anstyle-query --precise 1.0.0 cargo update -p anstyle-parse --precise 0.2.1 cargo update -p clap --precise 4.3.24 cargo update -p clap_lex --precise 0.5.0 + cargo update -p home --precise 0.5.5 - uses: Swatinem/rust-cache@v1 - name: Test run: cargo test --all --features unstable,legacy