Merge branch 'main' into cairo-lint-extension

Author: wawel37

.github/workflows/ci.yml

@@ -7,6 +7,10 @@ on:
   pull_request:
   merge_group:
 
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: ${{ github.head_ref != 'main' }}
+  
 jobs:
   build-test:
     name: build test ${{ matrix.platform.name }}

scarb/src/core/manifest/toml_manifest.rs

@@ -46,6 +46,7 @@ pub struct TomlManifest {
     pub dependencies: Option<BTreeMap<PackageName, MaybeTomlWorkspaceDependency>>,
     pub dev_dependencies: Option<BTreeMap<PackageName, MaybeTomlWorkspaceDependency>>,
     pub lib: Option<TomlTarget<TomlLibTargetParams>>,
+    pub executable: Option<TomlTarget<TomlExecutableTargetParams>>,
     pub cairo_plugin: Option<TomlTarget<TomlCairoPluginTargetParams>>,
     pub test: Option<Vec<TomlTarget<TomlExternalTargetParams>>>,
     pub target: Option<BTreeMap<TargetKind, Vec<TomlTarget<TomlExternalTargetParams>>>>,
@@ -295,6 +296,10 @@ pub struct TomlLibTargetParams {
     pub sierra_text: Option<bool>,
 }
 
+#[derive(Debug, Default, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct TomlExecutableTargetParams {}
+
 #[derive(Debug, Default, Deserialize, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct TomlCairoPluginTargetParams {
@@ -640,6 +645,14 @@ impl TomlManifest {
             None,
         )?);
 
+        targets.extend(Self::collect_target(
+            TargetKind::EXECUTABLE,
+            self.executable.as_ref(),
+            &package_name,
+            root,
+            None,
+        )?);
+
         for (kind, ext_toml) in self
             .target
             .iter()

scarb/src/core/publishing/manifest_normalization.rs

@@ -38,6 +38,7 @@ pub fn prepare_manifest_for_publish(pkg: &Package) -> Result<TomlManifest> {
         dependencies,
         dev_dependencies: None,
         lib: None,
+        executable: None,
         cairo_plugin,
         test: None,
         target: None,

scarb/src/core/registry/client/local.rs

@@ -114,7 +114,7 @@ impl RegistryClient for LocalRegistryClient<'_> {
             let records = match fsx::read(records_path) {
                 Err(e)
                     if e.downcast_ref::<io::Error>()
-                        .map_or(false, |ioe| ioe.kind() == io::ErrorKind::NotFound) =>
+                        .is_some_and(|ioe| ioe.kind() == io::ErrorKind::NotFound) =>
                 {
                     return Ok(RegistryResource::NotFound);
                 }

scarb/src/flock.rs

@@ -83,7 +83,7 @@ impl DerefMut for FileLockGuard {
 impl Drop for FileLockGuard {
     fn drop(&mut self) {
         if let Some(file) = self.file.take() {
-            let _ = file.unlock();
+            let _ = FileExt::unlock(&file);
         }
     }
 }
@@ -156,7 +156,7 @@ pub struct AdvisoryLockGuard {
     _inner: Arc<FileLockGuard>,
 }
 
-impl<'f> AdvisoryLock<'f> {
+impl AdvisoryLock<'_> {
     /// Acquires this advisory lock in an async manner.
     ///
     /// This lock is global per-process and can be acquired recursively.

scarb/src/ops/lockfile.rs

@@ -16,8 +16,7 @@ pub fn read_lockfile(ws: &Workspace<'_>) -> Result<Lockfile> {
         .open(ws.lockfile_path())
         .context("failed to open lockfile")?;
 
-    file.lock_shared()
-        .context("failed to acquire shared lockfile access")?;
+    FileExt::lock_shared(&file).context("failed to acquire shared lockfile access")?;
 
     let mut content = String::new();
     file.read_to_string(&mut content)?;

scarb/src/resolver/algorithm/mod.rs

@@ -65,7 +65,7 @@ mod state;
 /// packages that satisfy all incompatibilities cannot is never a solution of the dependency
 /// requirements). During the resolver run, new incompatibilities are derived until a valid solution
 /// is found in available versions.
-pub async fn resolve<'c>(
+pub async fn resolve(
     summaries: &[Summary],
     registry: &dyn Registry,
     lockfile: Lockfile,

scarb/src/resolver/algorithm/state.rs

@@ -37,7 +37,7 @@ impl ResolverState {
         Ok(())
     }
 
-    async fn process_request<'a>(
+    async fn process_request(
         &self,
         request: Request,
         registry: &dyn Registry,

scarb/src/sources/registry.rs

@@ -132,7 +132,7 @@ impl Source for RegistrySource<'_> {
     }
 }
 
-impl<'c> RegistrySource<'c> {
+impl RegistrySource<'_> {
     /// Turn the downloaded `.tar.zst` tarball into a [`Package`].
     ///
     /// This method extracts the tarball into cache directory, and then loads it using

scarb/tests/build_targets.rs

@@ -1119,3 +1119,32 @@ fn test_executable_compiler_creates_output_files() {
     t.child("target/dev/executable_test.executable.json")
         .assert(predicates::path::exists());
 }
+
+#[test]
+fn compile_executable_target_can_use_short_declaration() {
+    let t = TempDir::new().unwrap();
+    ProjectBuilder::start()
+        .name("executable_test")
+        .dep_cairo_test()
+        .dep_starknet()
+        .dep_cairo_execute()
+        .manifest_extra(indoc! {r#"
+            [executable]
+        "#})
+        .lib_cairo(indoc! {r#"
+            #[executable]
+            fn main() -> felt252 {
+                42
+            }
+        "#})
+        .build(&t);
+
+    Scarb::quick_snapbox()
+        .arg("build")
+        .current_dir(&t)
+        .assert()
+        .success();
+
+    t.child("target/dev/executable_test.executable.json")
+        .assert(predicates::path::exists());
+}

website/docs/extensions/cairo-language-server.md

@@ -1,13 +1,13 @@
 # Cairo Language Server
 
 Scarb is distributed with the `scarb cairo-language-server` extension which is a compilation of the official
-[Cairo Language Server](https://github.com/starkware-libs/cairo/tree/main/crates/cairo-lang-language-server),
+[Cairo Language Server](https://github.com/software-mansion/cairols),
 that is matching the version of Cairo compiler used in Scarb itself.
 Scarb's version of the language server is just a launcher for the original code, unmodified.
 
 ## Visual Studio Code
 
 The Cairo Visual Studio Code extension will start language server from Scarb automatically.
 You do not need to take any further steps.
-Consult extension's [documentation](https://github.com/starkware-libs/cairo/blob/main/vscode-cairo/README.md)
+Consult extension's [documentation](https://github.com/software-mansion/vscode-cairo)
 for more detailed information.