Skip to content

Commit

Permalink
bump rust to 1.73.0 (#1113)
Browse files Browse the repository at this point in the history
  • Loading branch information
kariy authored Oct 27, 2023
1 parent b7a8465 commit 0a772af
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_VERSION: 1.70.0
RUST_VERSION: 1.73.0

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion crates/dojo-lang/src/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ impl Compiler for DojoCompiler {
let mut manifest = target_dir
.open_ro("manifest.json", "output file", ws.config())
.map(|file| dojo_world::manifest::Manifest::try_from(file.deref()).unwrap_or_default())
.unwrap_or(dojo_world::manifest::Manifest::default());
.unwrap_or_default();

update_manifest(&mut manifest, db, &main_crate_ids, compiled_classes)?;

Expand Down
3 changes: 1 addition & 2 deletions crates/dojo-test-utils/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ fn main() {
use scarb::ops::{self, CompileOpts};
use scarb_ui::Verbosity;

let project_paths =
vec!["../../examples/spawn-and-move", "../torii/graphql/src/tests/types-test"];
let project_paths = ["../../examples/spawn-and-move", "../torii/graphql/src/tests/types-test"];

project_paths.iter().for_each(|path| compile(path));

Expand Down
3 changes: 1 addition & 2 deletions crates/katana/core/src/db/cached.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,7 @@ pub trait MaybeAsCachedDb {
fn maybe_as_cached_db(&self) -> Option<AsCachedDb>;
}

/// A wrapper type for [CachedState](blockifier::state::cached_state::CachedState) which
/// also allow storing the Sierra classes.
/// A wrapper type for [CachedState] which also allow storing the Sierra classes.
///
/// The inner fields are wrapped in [Arc] and an async [RwLock](tokio::sync::RwLock) as to allow for
/// asynchronous access to the state.
Expand Down
2 changes: 1 addition & 1 deletion crates/sozo/src/ops/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fn parse_event(
) -> Option<String> {
let keys = event.keys;
let event_hash = keys[0].to_string();
let Some(events) = events_map.get(&event_hash) else { return None };
let events = events_map.get(&event_hash)?;

'outer: for e in events {
let mut ret = format!("Event name: {}\n", e.name);
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.70.0"
channel = "1.73.0"

0 comments on commit 0a772af

Please sign in to comment.