Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump rust version to latest nightly #4404

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1d541b3
chore: bump rust version to latest nightly
StackOverflowExcept1on Dec 14, 2024
5a16b0f
fix tests
StackOverflowExcept1on Dec 14, 2024
b290d72
switch to `wasm32v1-none` target
StackOverflowExcept1on Dec 14, 2024
d7ba5ea
temporarily switch to beta rust instead of stable
StackOverflowExcept1on Dec 14, 2024
f083676
fix anyhow features in utils/node-wrapper
StackOverflowExcept1on Dec 14, 2024
ee4490b
Merge remote-tracking branch 'origin/master' into av/rust
StackOverflowExcept1on Dec 15, 2024
0d73df0
remove TODOs
StackOverflowExcept1on Dec 16, 2024
c450f77
fix static_mut_refs warning with gcore::{static_mut, static_ref} macros
StackOverflowExcept1on Dec 16, 2024
83004c8
fix wait_state_machine test
StackOverflowExcept1on Dec 16, 2024
0af7df8
fix semver in utils/crates-io
StackOverflowExcept1on Dec 16, 2024
c05cf17
switch to rust 2024 edition
StackOverflowExcept1on Dec 16, 2024
f39eb7b
fix fmt
StackOverflowExcept1on Dec 16, 2024
76004be
Merge remote-tracking branch 'origin/master' into av/rust
StackOverflowExcept1on Dec 16, 2024
ebe30af
link_section -> unsafe(link_section)
StackOverflowExcept1on Dec 16, 2024
0e51b62
2021 -> 2024
StackOverflowExcept1on Dec 16, 2024
d67b957
update cagro_metadata and cargo_toml
StackOverflowExcept1on Dec 16, 2024
b54e2d5
fix gear-wasm-builder
StackOverflowExcept1on Dec 16, 2024
8e39e90
idk how to fix it rn
StackOverflowExcept1on Dec 16, 2024
3559052
beta -> nightly-2024-12-14 (temp)
StackOverflowExcept1on Dec 16, 2024
733c263
temp ignore doc tests
StackOverflowExcept1on Dec 17, 2024
01d5a97
fix test in gmeta
StackOverflowExcept1on Dec 17, 2024
d3d4ddb
Revert "2021 -> 2024"
StackOverflowExcept1on Dec 17, 2024
e2157e8
switch back to 2021 edition and rollback fmt
StackOverflowExcept1on Dec 17, 2024
f08d3ca
revert gtest and gmeta fixes
StackOverflowExcept1on Dec 17, 2024
88d28b4
Revert "beta -> nightly-2024-12-14 (temp)"
StackOverflowExcept1on Dec 17, 2024
e1f02b7
Revert "temporarily switch to beta rust instead of stable"
StackOverflowExcept1on Dec 17, 2024
34b5f0f
back to wasm32-unknown-unknown target, set rust-version to 1.82
StackOverflowExcept1on Dec 17, 2024
e771d97
missed this
StackOverflowExcept1on Dec 17, 2024
2bf4edf
use match *self instead of &mut Self::Pattern
StackOverflowExcept1on Dec 17, 2024
52d9fa3
bump to nightly-2024-12-17
StackOverflowExcept1on Dec 17, 2024
65b27b8
Merge remote-tracking branch 'origin/master' into av/rust
StackOverflowExcept1on Dec 26, 2024
9d1b0b0
bump to nightly-2024-12-26
StackOverflowExcept1on Dec 26, 2024
1e01109
bump to nightly-2025-01-01
StackOverflowExcept1on Jan 1, 2025
b55865a
Merge remote-tracking branch 'origin/master' into av/rust
StackOverflowExcept1on Jan 1, 2025
77cbc84
fix fmt
StackOverflowExcept1on Jan 1, 2025
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
74 changes: 37 additions & 37 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
license = "GPL-3.0"
homepage = "https://gear-tech.io"
repository = "https://github.com/gear-tech/gear"
rust-version = "1.81"
rust-version = "1.82"

[workspace]
resolver = "2"
Expand Down Expand Up @@ -123,8 +123,8 @@ base64 = "0.21.7"
byteorder = { version = "1.5.0", default-features = false }
blake2 = { version = "0.10.6", default-features = false }
bs58 = { version = "0.5.1", default-features = false }
cargo_toml = "0.19.2"
cargo_metadata = "0.18.1"
cargo_toml = "0.21.0"
cargo_metadata = "0.19.1"
clap = "4.5.8"
codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false }
color-eyre = "0.6.3"
Expand Down Expand Up @@ -555,7 +555,7 @@ bytes = "1.8.0" # utils/gear-wasmer
loom = "0.7.2" # utils/gear-wasmer-cache

[workspace.lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(loom)', 'cfg(fuzz)'] }
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(loom)', 'cfg(fuzz)', 'cfg(substrate_runtime)'] }

[profile.dev.package.corosensei]
opt-level = 3
Expand Down
12 changes: 6 additions & 6 deletions common/src/gas_provider/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ pub trait Tree {
/// Type representing a quantity of token balance.
type Funds: Clone;

/// Types to denote a result of some unbalancing operation - that is
/// operations that create inequality between the underlying value
/// supply and some hypothetical "collateral" asset.
// Types to denote a result of some unbalancing operation - that is
// operations that create inequality between the underlying value
// supply and some hypothetical "collateral" asset.

/// `PositiveImbalance` indicates that some value has been added
/// to circulation , i.e. total supply has increased.
Expand Down Expand Up @@ -260,9 +260,9 @@ pub trait Provider {
/// Type representing a quantity of token balance.
type Funds;

/// Types to denote a result of some unbalancing operation - that is
/// operations that create inequality between the underlying value
/// supply and some hypothetical "collateral" asset.
// Types to denote a result of some unbalancing operation - that is
// operations that create inequality between the underlying value
// supply and some hypothetical "collateral" asset.

type InternalError: Error;

Expand Down
4 changes: 2 additions & 2 deletions common/src/gas_provider/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ impl<ExternalId: Clone, Id: Clone + Copy, Balance: Default + Zero + Clone + Copy

/// Get's a mutable access to node's inner gas balance, if it can have any
pub fn value_mut(&mut self) -> Option<&mut Balance> {
match self {
match *self {
Self::External { ref mut value, .. }
| Self::Cut { ref mut value, .. }
| Self::Reserved { ref mut value, .. }
Expand All @@ -351,7 +351,7 @@ impl<ExternalId: Clone, Id: Clone + Copy, Balance: Default + Zero + Clone + Copy

/// Get's a mutable access to node's locked gas balance, if it can have any.
pub fn lock_mut(&mut self) -> &mut NodeLock<Balance> {
match self {
match *self {
Self::External { ref mut lock, .. }
| Self::UnspecifiedLocal { ref mut lock, .. }
| Self::SpecifiedLocal { ref mut lock, .. }
Expand Down
2 changes: 1 addition & 1 deletion core-backend/src/funcs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@ where
)
}

pub fn forbidden(_args: &[Value]) -> impl Syscall<Caller> {
pub fn forbidden(_args: &[Value]) -> impl Syscall<Caller> + use<Caller, Ext> {
InfallibleSyscall::new(CostToken::Null, |_: &mut CallerWrap<Caller>| {
Err(ActorTerminationReason::Trap(TrapExplanation::ForbiddenFunction).into())
})
Expand Down
Loading
Loading