Skip to content

Commit 062029f

Browse files
authored
Update Scarb version and enable previously ignored test (#478)
1 parent ac4aa00 commit 062029f

7 files changed

+15
-12
lines changed

.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scarb nightly-2025-02-26
1+
scarb nightly-2025-03-12

tests/e2e/scarb/ignore_warnings_from_non_path_deps.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ fn caps(base: ClientCapabilities) -> ClientCapabilities {
2222
}
2323
}
2424

25-
#[ignore = "Uncomment after Scarb bump in CI"]
2625
#[test]
2726
fn test_ignore_warnings_from_non_path_deps() {
2827
let cairo_code = indoc! {r#"

tests/e2e/scarb/scarb_toml_change/snapshots/e2e__scarb__scarb_toml_change__removing_dependency__removing_dependency.snap

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
source: tests/e2e/scarb/scarb_toml_change/removing_dependency.rs
3+
description: "// → a/Scarb.toml\n[package]\nname = \"a\"\nversion = \"0.1.0\"\nedition = \"2024_07\"\n\n[dependencies]\nb = { path = \"../b\" }\n\n// → a/src/lib.cairo\n\n\n// → b/Scarb.toml\n[package]\nname = \"b\"\nversion = \"0.1.0\"\nedition = \"2024_07\"\n\n// → b/src/lib.cairo\n"
34
expression: "AnalyzedCratesResult { analyzed_crates, analyzed_crates_diff }"
45
---
56
analyzed_crates = '''
@@ -95,8 +96,8 @@ analyzed_crates = '''
9596
version: Some(
9697
Version {
9798
major: 2,
98-
minor: 10,
99-
patch: 1,
99+
minor: 11,
100+
patch: 2,
100101
},
101102
),
102103
cfg_set: Some(

tests/e2e/scarb/scarb_toml_change/snapshots/e2e__scarb__scarb_toml_change__removing_member__removing_member.snap

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
source: tests/e2e/scarb/scarb_toml_change/removing_member.rs
3+
description: "// → Scarb.toml\n[workspace]\nmembers = [\n \"a\",\n \"b\"\n]\n\n// → a/Scarb.toml\n[package]\nname = \"a\"\nversion = \"0.1.0\"\nedition = \"2024_07\"\n\n[dependencies]\nb = { path = \"../b\" }\n\n// → a/src/lib.cairo\n\n\n// → b/Scarb.toml\n[package]\nname = \"b\"\nversion = \"0.1.0\"\nedition = \"2024_07\"\n\n// → b/src/lib.cairo\n"
34
expression: "AnalyzedCratesResult { analyzed_crates, analyzed_crates_diff }"
45
---
56
analyzed_crates = '''
@@ -96,8 +97,8 @@ analyzed_crates = '''
9697
version: Some(
9798
Version {
9899
major: 2,
99-
minor: 10,
100-
patch: 1,
100+
minor: 11,
101+
patch: 2,
101102
},
102103
),
103104
cfg_set: Some(

tests/e2e/scarb/snapshots/e2e__scarb__simple_deps__simple_deps.snap

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
source: tests/e2e/scarb/simple_deps.rs
3+
description: "// → a/Scarb.toml\n[package]\nname = \"a\"\nversion = \"0.1.0\"\nedition = \"2024_07\"\n\n[dependencies]\nb = { path = \"../b\" }\n\n// → a/src/lib.cairo\nuse b::Foo;\n\nfn main() {\n let foo = Foo::Bar;\n match foo {\n Foo::Baz => {},\n _ => {}\n }\n}\n\n// → b/Scarb.toml\n[package]\nname = \"b\"\nversion = \"0.1.0\"\nedition = \"2024_07\"\n\n// → b/src/lib.cairo\npub enum Foo {\n Bar,\n Baz,\n}\n\nmod non_existent;"
34
expression: "normalize(&ls, analyzed_crates)"
45
---
56
# Analyzed Crates
@@ -94,8 +95,8 @@ expression: "normalize(&ls, analyzed_crates)"
9495
version: Some(
9596
Version {
9697
major: 2,
97-
minor: 10,
98-
patch: 1,
98+
minor: 11,
99+
patch: 2,
99100
},
100101
),
101102
cfg_set: Some(

tests/e2e/scarb/unmanaged_core.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ fn test_unmanaged_core_on_invalid_scarb_toml() {
3131
version: Some(
3232
Version {
3333
major: 2,
34-
minor: 10,
35-
patch: 1,
34+
minor: 11,
35+
patch: 2,
3636
},
3737
),
3838
cfg_set: None,

tests/e2e/snapshots/e2e__analysis__view_analyzed_crates.snap

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
source: tests/e2e/analysis.rs
3+
description: "// → project1/cairo_project.toml\n[crate_roots]\nproject1 = \"src\"\n\n// → project1/src/lib.cairo\nfn main() {}\n\n// → project2/cairo_project.toml\n[crate_roots]\nproject2 = \"src\"\n\n// → project2/src/lib.cairo\nfn main() {}\n\n// → project2/subproject/cairo_project.toml\n[crate_roots]\nsubproject = \"src\"\n\n// → project2/subproject/src/lib.cairo\nfn main() {}"
34
expression: "normalize(&ls, output)"
45
---
56
# Analyzed Crates
@@ -12,8 +13,8 @@ expression: "normalize(&ls, output)"
1213
version: Some(
1314
Version {
1415
major: 2,
15-
minor: 10,
16-
patch: 1,
16+
minor: 11,
17+
patch: 2,
1718
},
1819
),
1920
cfg_set: None,

0 commit comments

Comments
 (0)