From f9e28537764e69c179e2b5aee7d05e76ac37ec75 Mon Sep 17 00:00:00 2001 From: maciektr Date: Wed, 14 Feb 2024 17:14:37 +0100 Subject: [PATCH] Prepare release `2.6.0-rc.1` --- Cargo.lock | 12 ++--- Cargo.toml | 46 +++++++++---------- .../src/metadata.rs | 4 ++ scarb/src/compiler/db.rs | 4 +- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 709d53870..6f8f38977 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4469,7 +4469,7 @@ dependencies = [ [[package]] name = "scarb" -version = "2.6.0-rc.0" +version = "2.6.0-rc.1" dependencies = [ "anyhow", "assert_fs", @@ -4553,7 +4553,7 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.6.0-rc.0" +version = "2.6.0-rc.1" dependencies = [ "cargo_metadata", "semver", @@ -4561,7 +4561,7 @@ dependencies = [ [[package]] name = "scarb-cairo-language-server" -version = "2.6.0-rc.0" +version = "2.6.0-rc.1" dependencies = [ "cairo-lang-language-server", "cairo-lang-utils", @@ -4571,7 +4571,7 @@ dependencies = [ [[package]] name = "scarb-cairo-run" -version = "2.6.0-rc.0" +version = "2.6.0-rc.1" dependencies = [ "anyhow", "assert_fs", @@ -4593,7 +4593,7 @@ dependencies = [ [[package]] name = "scarb-cairo-test" -version = "2.6.0-rc.0" +version = "2.6.0-rc.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -4658,7 +4658,7 @@ dependencies = [ [[package]] name = "scarb-snforge-test-collector" -version = "2.6.0-rc.0" +version = "2.6.0-rc.1" dependencies = [ "anyhow", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index 831156e9e..d36876c44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.6.0-rc.0" +version = "2.6.0-rc.1" edition = "2021" authors = ["Software Mansion "] @@ -33,28 +33,28 @@ assert_fs = "1" async-trait = "0.1" axum = { version = "0.6", features = ["http2"] } cairo-felt = "0.9.1" -cairo-lang-casm = "2.6.0-rc.0" -cairo-lang-compiler = "2.6.0-rc.0" -cairo-lang-debug = "2.6.0-rc.0" -cairo-lang-defs = "2.6.0-rc.0" -cairo-lang-diagnostics = "2.6.0-rc.0" -cairo-lang-filesystem = "2.6.0-rc.0" -cairo-lang-formatter = "2.6.0-rc.0" -cairo-lang-language-server = "2.6.0-rc.0" -cairo-lang-lowering = "2.6.0-rc.0" -cairo-lang-project = "2.6.0-rc.0" -cairo-lang-runner = "2.6.0-rc.0" -cairo-lang-semantic = "2.6.0-rc.0" -cairo-lang-sierra = "2.6.0-rc.0" -cairo-lang-sierra-generator = "2.6.0-rc.0" -cairo-lang-sierra-to-casm = "2.6.0-rc.0" -cairo-lang-sierra-type-size = "2.6.0-rc.0" -cairo-lang-starknet = "2.6.0-rc.0" -cairo-lang-starknet-classes = "2.6.0-rc.0" -cairo-lang-syntax = "2.6.0-rc.0" -cairo-lang-test-plugin = "2.6.0-rc.0" -cairo-lang-test-runner = "2.6.0-rc.0" -cairo-lang-utils = { version = "2.6.0-rc.0", features = ["env_logger"] } +cairo-lang-casm = "2.6.0-rc.1" +cairo-lang-compiler = "2.6.0-rc.1" +cairo-lang-debug = "2.6.0-rc.1" +cairo-lang-defs = "2.6.0-rc.1" +cairo-lang-diagnostics = "2.6.0-rc.1" +cairo-lang-filesystem = "2.6.0-rc.1" +cairo-lang-formatter = "2.6.0-rc.1" +cairo-lang-language-server = "2.6.0-rc.1" +cairo-lang-lowering = "2.6.0-rc.1" +cairo-lang-project = "2.6.0-rc.1" +cairo-lang-runner = "2.6.0-rc.1" +cairo-lang-semantic = "2.6.0-rc.1" +cairo-lang-sierra = "2.6.0-rc.1" +cairo-lang-sierra-generator = "2.6.0-rc.1" +cairo-lang-sierra-to-casm = "2.6.0-rc.1" +cairo-lang-sierra-type-size = "2.6.0-rc.1" +cairo-lang-starknet = "2.6.0-rc.1" +cairo-lang-starknet-classes = "2.6.0-rc.1" +cairo-lang-syntax = "2.6.0-rc.1" +cairo-lang-test-plugin = "2.6.0-rc.1" +cairo-lang-test-runner = "2.6.0-rc.1" +cairo-lang-utils = { version = "2.6.0-rc.1", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/extensions/scarb-snforge-test-collector/src/metadata.rs b/extensions/scarb-snforge-test-collector/src/metadata.rs index 5e46609dc..a61e01bce 100644 --- a/extensions/scarb-snforge-test-collector/src/metadata.rs +++ b/extensions/scarb-snforge-test-collector/src/metadata.rs @@ -1,4 +1,5 @@ use anyhow::{anyhow, ensure, Context, Result}; +use cairo_lang_filesystem::cfg::{Cfg, CfgSet}; use cairo_lang_filesystem::db::{CrateSettings, Edition, ExperimentalFeaturesConfig}; use cairo_lang_project::AllCratesConfig; use cairo_lang_utils::ordered_hash_map::OrderedHashMap; @@ -189,6 +190,9 @@ fn get_crate_settings_for_package( negative_impls: package .experimental_features .contains(&String::from("negative_impls")), + coupons: package + .experimental_features + .contains(&String::from("coupons")), }; CrateSettings { diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs index 645b07fe3..7287016de 100644 --- a/scarb/src/compiler/db.rs +++ b/scarb/src/compiler/db.rs @@ -108,9 +108,7 @@ fn build_project_config(unit: &CompilationUnit) -> Result { experimental_features: cairo_lang_filesystem::db::ExperimentalFeaturesConfig { negative_impls: experimental_features .contains(&SmolStr::new_inline("negative_impls")), - // TODO(maciektr): Fix corelib config and remove the override. - coupons: component.package.id.is_core() - || experimental_features.contains(&SmolStr::new_inline("coupons")), + coupons: experimental_features.contains(&SmolStr::new_inline("coupons")), }, }, )