Skip to content

Commit ca26835

Browse files
authored
chore: bump solar + MSRV (#289)
bumps solar to v0.1.5 and MSRV to 1.88
1 parent 5846d3c commit ca26835

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
25-
rust: ["stable", "1.87"]
25+
rust: ["stable", "1.88"]
2626
flags: ["", "--all-features"]
2727
exclude:
2828
# Skip because some features have higher MSRV.
29-
- rust: "1.87" # MSRV
29+
- rust: "1.88" # MSRV
3030
flags: "--all-features"
3131
steps:
3232
- uses: actions/checkout@v4

Cargo.toml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resolver = "2"
55
[workspace.package]
66
authors = ["Foundry Maintainers"]
77
version = "0.17.4"
8-
rust-version = "1.87"
8+
rust-version = "1.88"
99
readme = "README.md"
1010
license = "MIT OR Apache-2.0"
1111
repository = "https://github.com/foundry-rs/compilers"
@@ -54,8 +54,8 @@ semver = { version = "1.0", features = ["serde"] }
5454
serde = { version = "1", features = ["derive", "rc"] }
5555
serde_json = "1.0"
5656
similar-asserts = "1"
57-
solar-parse = { version = "=0.1.4", default-features = false }
58-
solar-sema = { version = "=0.1.4", default-features = false }
57+
solar-parse = { version = "=0.1.5", default-features = false }
58+
solar-sema = { version = "=0.1.5", default-features = false }
5959
svm = { package = "svm-rs", version = "0.5", default-features = false }
6060
tempfile = "3.9"
6161
thiserror = "2"
@@ -68,3 +68,9 @@ futures-util = "0.3"
6868
tokio = { version = "1.35", features = ["rt-multi-thread"] }
6969

7070
snapbox = "0.6.9"
71+
72+
# [patch.crates-io]
73+
# solar-parse = { git = "https://github.com/paradigmxyz/solar", branch = "main" }
74+
# solar-sema = { git = "https://github.com/paradigmxyz/solar", branch = "main" }
75+
# solar-ast = { git = "https://github.com/paradigmxyz/solar", branch = "main" }
76+
# solar-interface = { git = "https://github.com/paradigmxyz/solar", branch = "main" }

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ When updating this, also update:
2525
- .github/workflows/ci.yml
2626
-->
2727

28-
The current MSRV (minimum supported rust version) is 1.87.
28+
The current MSRV (minimum supported rust version) is 1.88.
2929

3030
Note that the MSRV is not increased automatically, and only as part of a minor
3131
release.

clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.87"
1+
msrv = "1.88"

crates/compilers/src/cache/iface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub(crate) fn interface_representation_ast(
3838
let is_exposed = match function.kind {
3939
// Function with external or public visibility
4040
ast::FunctionKind::Function => {
41-
function.header.visibility >= Some(ast::Visibility::Public)
41+
function.header.visibility.map(|v| *v) >= Some(ast::Visibility::Public)
4242
}
4343
ast::FunctionKind::Constructor
4444
| ast::FunctionKind::Fallback

crates/compilers/src/resolver/parse.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ fn library_is_inlined(contract: &ast::ItemContract<'_>) -> bool {
272272
})
273273
.all(|f| {
274274
!matches!(
275-
f.header.visibility,
275+
f.header.visibility.map(|v| *v),
276276
Some(ast::Visibility::Public | ast::Visibility::External)
277277
)
278278
})

0 commit comments

Comments
 (0)