Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into use-v2-types-scanner
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xanewok
Xanewok committed Jun 20, 2024
2 parents 69b5a22 + 369ee30 commit edc7447
Show file tree
Hide file tree
Showing 69 changed files with 331 additions and 227 deletions.
5 changes: 5 additions & 0 deletions .changeset/dirty-lemons-grin.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nomicfoundation/slang": patch
---

upgrade to rust `1.79.0`.
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"rust-analyzer.imports.granularity.group": "module",
"rust-analyzer.imports.prefix": "crate",
"rust-analyzer.rustfmt.extraArgs": [
"+nightly-2024-02-21" // __RUST_NIGHTLY_VERSION_MARKER__ (keep in sync)
"+nightly-2024-06-17" // __RUST_NIGHTLY_VERSION_MARKER__ (keep in sync)
],
"rust-analyzer.server.path": "${workspaceFolder}/scripts/bin/rust-analyzer",
"search.exclude": {
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# changelog

## 0.15.1

### Patch Changes

- [#1012](https://github.com/NomicFoundation/slang/pull/1012) [`9ca51b4`](https://github.com/NomicFoundation/slang/commit/9ca51b431e6d9e52b537683bf618d8852103936b) Thanks [@OmarTawfik](https://github.com/OmarTawfik)! - expose `QueryMatch` to public API

## 0.15.0

### Minor Changes
Expand Down
59 changes: 29 additions & 30 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 33 additions & 31 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace.package]
version = "0.15.0" # Should be kept in sync with the internal dependencies table below
rust-version = "1.76.0" # __RUST_STABLE_VERSION_MARKER__ (keep in sync)
version = "0.15.1"
rust-version = "1.79.0" # __RUST_STABLE_VERSION_MARKER__ (keep in sync)
edition = "2021"
publish = false

Expand Down Expand Up @@ -46,39 +46,39 @@ members = [
#
# Internal
#
codegen_ebnf = { path = "crates/codegen/ebnf", version = "0.15.0" }
codegen_language_definition = { path = "crates/codegen/language/definition", version = "0.15.0" }
codegen_language_internal_macros = { path = "crates/codegen/language/internal_macros", version = "0.15.0" }
codegen_language_macros = { path = "crates/codegen/language/macros", version = "0.15.0" }
codegen_language_tests = { path = "crates/codegen/language/tests", version = "0.15.0" }
codegen_runtime_cargo = { path = "crates/codegen/runtime/cargo", version = "0.15.0" }
codegen_runtime_generator = { path = "crates/codegen/runtime/generator", version = "0.15.0" }
codegen_runtime_node_addon = { path = "crates/codegen/runtime/node_addon", version = "0.15.0" }
codegen_runtime_npm = { path = "crates/codegen/runtime/npm", version = "0.15.0" }
codegen_spec = { path = "crates/codegen/spec", version = "0.15.0" }
codegen_testing = { path = "crates/codegen/testing", version = "0.15.0" }
codegen_ebnf = { path = "crates/codegen/ebnf", version = "0.15.1" }
codegen_language_definition = { path = "crates/codegen/language/definition", version = "0.15.1" }
codegen_language_internal_macros = { path = "crates/codegen/language/internal_macros", version = "0.15.1" }
codegen_language_macros = { path = "crates/codegen/language/macros", version = "0.15.1" }
codegen_language_tests = { path = "crates/codegen/language/tests", version = "0.15.1" }
codegen_runtime_cargo = { path = "crates/codegen/runtime/cargo", version = "0.15.1" }
codegen_runtime_generator = { path = "crates/codegen/runtime/generator", version = "0.15.1" }
codegen_runtime_node_addon = { path = "crates/codegen/runtime/node_addon", version = "0.15.1" }
codegen_runtime_npm = { path = "crates/codegen/runtime/npm", version = "0.15.1" }
codegen_spec = { path = "crates/codegen/spec", version = "0.15.1" }
codegen_testing = { path = "crates/codegen/testing", version = "0.15.1" }

infra_cli = { path = "crates/infra/cli", version = "0.15.0" }
infra_utils = { path = "crates/infra/utils", version = "0.15.0" }
infra_cli = { path = "crates/infra/cli", version = "0.15.1" }
infra_utils = { path = "crates/infra/utils", version = "0.15.1" }

metaslang_graph_builder = { path = "crates/metaslang/graph_builder", version = "0.15.0" }
metaslang_cst = { path = "crates/metaslang/cst", version = "0.15.0" }
metaslang_graph_builder = { path = "crates/metaslang/graph_builder", version = "0.15.1" }
metaslang_cst = { path = "crates/metaslang/cst", version = "0.15.1" }

slang_solidity = { path = "crates/solidity/outputs/cargo/slang_solidity", version = "0.15.0" }
slang_solidity_node_addon = { path = "crates/solidity/outputs/cargo/slang_solidity_node_addon", version = "0.15.0" }
solidity_cargo_tests = { path = "crates/solidity/outputs/cargo/tests", version = "0.15.0" }
solidity_language = { path = "crates/solidity/inputs/language", version = "0.15.0" }
solidity_npm_package = { path = "crates/solidity/outputs/npm/package", version = "0.15.0" }
solidity_spec = { path = "crates/solidity/outputs/spec", version = "0.15.0" }
solidity_testing_sanctuary = { path = "crates/solidity/testing/sanctuary", version = "0.15.0" }
solidity_testing_snapshots = { path = "crates/solidity/testing/snapshots", version = "0.15.0" }
solidity_testing_solc = { path = "crates/solidity/testing/solc", version = "0.15.0" }
slang_solidity = { path = "crates/solidity/outputs/cargo/slang_solidity", version = "0.15.1" }
slang_solidity_node_addon = { path = "crates/solidity/outputs/cargo/slang_solidity_node_addon", version = "0.15.1" }
solidity_cargo_tests = { path = "crates/solidity/outputs/cargo/tests", version = "0.15.1" }
solidity_language = { path = "crates/solidity/inputs/language", version = "0.15.1" }
solidity_npm_package = { path = "crates/solidity/outputs/npm/package", version = "0.15.1" }
solidity_spec = { path = "crates/solidity/outputs/spec", version = "0.15.1" }
solidity_testing_sanctuary = { path = "crates/solidity/testing/sanctuary", version = "0.15.1" }
solidity_testing_snapshots = { path = "crates/solidity/testing/snapshots", version = "0.15.1" }
solidity_testing_solc = { path = "crates/solidity/testing/solc", version = "0.15.1" }

slang_testlang = { path = "crates/testlang/outputs/cargo/slang_testlang", version = "0.15.0" }
slang_testlang_node_addon = { path = "crates/testlang/outputs/cargo/slang_testlang_node_addon", version = "0.15.0" }
testlang_cargo_tests = { path = "crates/testlang/outputs/cargo/tests", version = "0.15.0" }
testlang_language = { path = "crates/testlang/inputs/language", version = "0.15.0" }
testlang_npm_package = { path = "crates/testlang/outputs/npm/package", version = "0.15.0" }
slang_testlang = { path = "crates/testlang/outputs/cargo/slang_testlang", version = "0.15.1" }
slang_testlang_node_addon = { path = "crates/testlang/outputs/cargo/slang_testlang_node_addon", version = "0.15.1" }
testlang_cargo_tests = { path = "crates/testlang/outputs/cargo/tests", version = "0.15.1" }
testlang_language = { path = "crates/testlang/inputs/language", version = "0.15.1" }
testlang_npm_package = { path = "crates/testlang/outputs/npm/package", version = "0.15.1" }

#
# External
Expand Down Expand Up @@ -159,11 +159,13 @@ rest_pat_in_fully_bound_structs = "warn" # Prefer not to use `..` in fully bound
verbose_file_reads = "warn" # Prefer simpler and more concise `fs::read_to_string`
# Pedantic
pedantic = "warn" # Warn about pedantic lints, except...
assigning_clones = { level = "allow", priority = 1 } # `clone_from()` is less readable, and is rarely used/implemented
match_same_arms = { level = "allow", priority = 1 } # It's often clearer to have the same arm twice
missing_errors_doc = { level = "allow", priority = 1 } # Most of our code is internal; let's not clutter the docs until...
missing_panics_doc = { level = "allow", priority = 1 } # ... we care about the public documentation in our shipped crates
module_name_repetitions = { level = "allow", priority = 1 } # It seems we prefer it this way; we'd need to discuss that
must_use_candidate = { level = "allow", priority = 1 } # Overzealous, we'd have to `[must_use]` a lot of things
needless_raw_string_hashes = { level = "allow", priority = 1 } # It is easier to use hashes consistently on all tests/examples in a file
redundant_closure_for_method_calls = { level = "allow", priority = 1 } # Not always clearer, let's not pepper `allow`s whenever needed
# Nursery
collection_is_never_read = "warn" # Lint against collections not used after creation
Expand Down
7 changes: 4 additions & 3 deletions Pipfile.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit edc7447

Please sign in to comment.