From 57c8074e5b252e2ac929679a55813de2ba37edc8 Mon Sep 17 00:00:00 2001 From: Su Mingxian Date: Sat, 21 Dec 2024 01:08:14 +0800 Subject: [PATCH] Update `linkme` to `0.3.31` to make this repo works with rust edition 2024 toolchains, use Cargo.lock from `arceos` in CI (#4) * try adding `unsafe` to `linkme` * revert previous commit, update `linkme` to 0.3.31 * use Cargo.lock from `arceos` in CI --- rust/exception/Cargo.toml | 2 +- scripts/get_deps.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rust/exception/Cargo.toml b/rust/exception/Cargo.toml index b9fbee3..73d797c 100644 --- a/rust/exception/Cargo.toml +++ b/rust/exception/Cargo.toml @@ -11,4 +11,4 @@ axstd = ["linkme", "dep:axstd"] [dependencies] axstd = { workspace = true, optional = true, features = ["paging"] } -linkme = { version = "0.3", optional = true } +linkme = { version = "0.3.31", optional = true } diff --git a/scripts/get_deps.sh b/scripts/get_deps.sh index 2339e7f..8ee684f 100755 --- a/scripts/get_deps.sh +++ b/scripts/get_deps.sh @@ -5,4 +5,7 @@ AX_ROOT=.arceos test ! -d "$AX_ROOT" && echo "Cloning repositories ..." || true test ! -d "$AX_ROOT" && git clone https://github.com/arceos-org/arceos "$AX_ROOT" --depth=1 || true +echo "Copying Cargo.lock ..." +cp "$AX_ROOT/Cargo.lock" Cargo.lock + $(dirname $0)/set_ax_root.sh $AX_ROOT