From bbb63fae8b6bdd36832c7ffc1e77fca99e7333f8 Mon Sep 17 00:00:00 2001 From: John Lapeyre Date: Thu, 11 Jan 2024 18:47:53 -0500 Subject: [PATCH 1/6] Remove MIT from license, and a bit of cruft, in top Cargo.toml --- Cargo.toml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ec11fe6..cbcfdff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,28 +5,9 @@ resolver = "2" [workspace.package] rust-version = "1.70" edition = "2021" -license = "MIT OR Apache-2.0" +license = "Apache-2.0" authors = ["OpenQASM3 parser team"] -[profile.dev] -# Disabling debug info speeds up builds a bunch, -# and we don't rely on it for debugging that much. -# debug = 0 - -[profile.dev.package] -# These speed up local tests. -# rowan.opt-level = 3 -# rustc-hash.opt-level = 3 -# smol_str.opt-level = 3 -# text-size.opt-level = 3 -# # This speeds up `cargo xtask dist`. -# miniz_oxide.opt-level = 3 - -# [profile.release] -# incremental = true -# # Set this to 1 or 2 to get more useful backtraces in debugger. -# debug = 0 - [workspace.dependencies] # local crates lexer = { path = "./crates/lexer", version = "0.0.0" } @@ -35,11 +16,8 @@ oq3_syntax = { path = "./crates/oq3_syntax", version = "0.0.0" } semantics = { path = "./crates/semantics", version = "0.0.0" } source_file = { path = "./crates/source_file", version = "0.0.0" } sourcegen = { path = "./crates/sourcegen", version = "0.0.0" } -#ast_pyo3 = { path = "./crates/ast_pyo3", version = "0.0.0" } # non-local crates -# sourcegen has a hard-coded path. This is a bug, it cannot be used as a standalone crate -# sourcegen = { version = "0.0.187", package = "ra_ap_sourcegen" } limit = { version = "0.0.188", package = "ra_ap_limit" } stdx = { version = "0.0.188", package = "ra_ap_stdx"} triomphe = { version = "0.1.8", default-features = false, features = ["std"] } @@ -51,6 +29,5 @@ smallvec = { version = "1.10.0", features = [ smol_str = "0.2.0" nohash-hasher = "0.2.0" text-size = "1.1.0" - # can't upgrade due to dashmap depending on 0.12.3 currently hashbrown = { version = "0.12.3", features = ["inline-more"], default-features = false } From b51c31a15b89cbfc66c5a79d7fa6c80553c0b0db Mon Sep 17 00:00:00 2001 From: John Lapeyre Date: Thu, 11 Jan 2024 20:12:46 -0500 Subject: [PATCH 2/6] Add SPDX-License-Identifer line to all source files --- codegen_scripts/cleangenerated.sh | 1 + codegen_scripts/cpgenerated.sh | 1 + codegen_scripts/cpnodes.sh | 1 + codegen_scripts/mk_nodes.sh | 1 + codegen_scripts/mk_syntax_kinds.sh | 1 + codegen_scripts/mk_syntax_tokens.sh | 1 + codegen_scripts/mkgenerated.sh | 1 + crates/lexer/src/cursor.rs | 1 + crates/lexer/src/lib.rs | 1 + crates/lexer/src/tests.rs | 1 + crates/lexer/src/unescape.rs | 1 + crates/lexer/src/unescape/tests.rs | 1 + crates/oq3_syntax/examples/demotest.rs | 1 + crates/oq3_syntax/examples/itemparse.rs | 1 + crates/oq3_syntax/examples/promote.rs | 1 + crates/oq3_syntax/src/ast.rs | 1 + crates/oq3_syntax/src/ast/edit.rs | 1 + crates/oq3_syntax/src/ast/expr_ext.rs | 1 + crates/oq3_syntax/src/ast/generated.rs | 1 + crates/oq3_syntax/src/ast/generated/nodes.rs | 1 + crates/oq3_syntax/src/ast/generated/tokens.rs | 1 + crates/oq3_syntax/src/ast/make.rs | 1 + crates/oq3_syntax/src/ast/node_ext.rs | 1 + crates/oq3_syntax/src/ast/operators.rs | 1 + crates/oq3_syntax/src/ast/prec.rs | 1 + crates/oq3_syntax/src/ast/token_ext.rs | 1 + crates/oq3_syntax/src/ast/traits.rs | 1 + crates/oq3_syntax/src/ast/type_ext.rs | 1 + crates/oq3_syntax/src/lib.rs | 1 + crates/oq3_syntax/src/parsing.rs | 1 + crates/oq3_syntax/src/ptr.rs | 1 + crates/oq3_syntax/src/syntax_error.rs | 1 + crates/oq3_syntax/src/syntax_node.rs | 1 + crates/oq3_syntax/src/ted.rs | 1 + crates/oq3_syntax/src/tests.rs | 1 + crates/oq3_syntax/src/tests/ast_src.rs | 1 + crates/oq3_syntax/src/tests/sourcegen_ast.rs | 1 + crates/oq3_syntax/src/token_text.rs | 1 + crates/oq3_syntax/src/validation.rs | 1 + crates/oq3_syntax/src/validation/block.rs | 1 + crates/parser/src/event.rs | 1 + crates/parser/src/grammar.rs | 1 + crates/parser/src/grammar/expressions.rs | 1 + crates/parser/src/grammar/expressions/atom.rs | 1 + crates/parser/src/grammar/items.rs | 1 + crates/parser/src/grammar/params.rs | 1 + crates/parser/src/input.rs | 1 + crates/parser/src/lexed_str.rs | 1 + crates/parser/src/lib.rs | 1 + crates/parser/src/output.rs | 1 + crates/parser/src/parser.rs | 1 + crates/parser/src/shortcuts.rs | 1 + crates/parser/src/syntax_kind.rs | 1 + crates/parser/src/syntax_kind/syntax_kind_enum.rs | 1 + crates/parser/src/token_set.rs | 1 + crates/semantics/examples/semdemo.rs | 1 + crates/semantics/src/asg.rs | 1 + crates/semantics/src/context.rs | 1 + crates/semantics/src/display.rs | 1 + crates/semantics/src/initialize_ast.rs | 1 + crates/semantics/src/lib.rs | 1 + crates/semantics/src/semantic_error.rs | 1 + crates/semantics/src/symbols.rs | 1 + crates/semantics/src/syntax_to_semantics.rs | 1 + crates/semantics/src/types.rs | 1 + crates/semantics/src/utils.rs | 1 + crates/semantics/src/validate.rs | 1 + crates/semantics/tests/ast_tests.rs | 1 + crates/semantics/tests/from_string_tests.rs | 1 + crates/semantics/tests/symbol_tests.rs | 1 + crates/semantics/tests/types_test.rs | 1 + crates/source_file/src/api.rs | 1 + crates/source_file/src/lib.rs | 1 + crates/source_file/src/source_file.rs | 1 + crates/sourcegen/src/lib.rs | 1 + run_rustfmt.sh | 1 + run_tests.sh | 1 + run_tests_less.sh | 1 + 78 files changed, 78 insertions(+) diff --git a/codegen_scripts/cleangenerated.sh b/codegen_scripts/cleangenerated.sh index 9f2651c..e1d951a 100755 --- a/codegen_scripts/cleangenerated.sh +++ b/codegen_scripts/cleangenerated.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # Remove backups of generated code. # Also remove the temporary file that generated code is written to. diff --git a/codegen_scripts/cpgenerated.sh b/codegen_scripts/cpgenerated.sh index c12f454..f159912 100755 --- a/codegen_scripts/cpgenerated.sh +++ b/codegen_scripts/cpgenerated.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # For generated.rs # Copy the generated code from the temporary files to which it is written diff --git a/codegen_scripts/cpnodes.sh b/codegen_scripts/cpnodes.sh index e43bac4..0176714 100755 --- a/codegen_scripts/cpnodes.sh +++ b/codegen_scripts/cpnodes.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # For nodes.rs # Copy the generated code from the temporary files to which it is written diff --git a/codegen_scripts/mk_nodes.sh b/codegen_scripts/mk_nodes.sh index ced2420..838d155 100755 --- a/codegen_scripts/mk_nodes.sh +++ b/codegen_scripts/mk_nodes.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # See mkgenerated.sh diff --git a/codegen_scripts/mk_syntax_kinds.sh b/codegen_scripts/mk_syntax_kinds.sh index 56f2915..e3b2764 100755 --- a/codegen_scripts/mk_syntax_kinds.sh +++ b/codegen_scripts/mk_syntax_kinds.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # See mkgenerated.sh diff --git a/codegen_scripts/mk_syntax_tokens.sh b/codegen_scripts/mk_syntax_tokens.sh index 0b17b8c..34baee7 100755 --- a/codegen_scripts/mk_syntax_tokens.sh +++ b/codegen_scripts/mk_syntax_tokens.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # See mkgenerated.sh diff --git a/codegen_scripts/mkgenerated.sh b/codegen_scripts/mkgenerated.sh index 8f4ca2f..1fd603d 100755 --- a/codegen_scripts/mkgenerated.sh +++ b/codegen_scripts/mkgenerated.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # This is not how r-a does generation. # But I find a boot strapping problem. diff --git a/crates/lexer/src/cursor.rs b/crates/lexer/src/cursor.rs index 3c52dca..5530b07 100644 --- a/crates/lexer/src/cursor.rs +++ b/crates/lexer/src/cursor.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use std::str::Chars; diff --git a/crates/lexer/src/lib.rs b/crates/lexer/src/lib.rs index 5dab052..fdf3359 100644 --- a/crates/lexer/src/lib.rs +++ b/crates/lexer/src/lib.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Low-level OpenQASM3 lexer. //! diff --git a/crates/lexer/src/tests.rs b/crates/lexer/src/tests.rs index b2670a7..2f9b094 100644 --- a/crates/lexer/src/tests.rs +++ b/crates/lexer/src/tests.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use super::*; diff --git a/crates/lexer/src/unescape.rs b/crates/lexer/src/unescape.rs index cb834c6..c45d0b9 100644 --- a/crates/lexer/src/unescape.rs +++ b/crates/lexer/src/unescape.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Utilities for validating string and char literals and turning them into //! values they represent. diff --git a/crates/lexer/src/unescape/tests.rs b/crates/lexer/src/unescape/tests.rs index 39189fe..50e4fa1 100644 --- a/crates/lexer/src/unescape/tests.rs +++ b/crates/lexer/src/unescape/tests.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use super::*; diff --git a/crates/oq3_syntax/examples/demotest.rs b/crates/oq3_syntax/examples/demotest.rs index 3709336..697afd0 100644 --- a/crates/oq3_syntax/examples/demotest.rs +++ b/crates/oq3_syntax/examples/demotest.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use clap::{Parser, Subcommand}; use std::fs; diff --git a/crates/oq3_syntax/examples/itemparse.rs b/crates/oq3_syntax/examples/itemparse.rs index 1e3113d..b223b0d 100644 --- a/crates/oq3_syntax/examples/itemparse.rs +++ b/crates/oq3_syntax/examples/itemparse.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use ast::{HasModuleItem, HasName}; use oq3_syntax::ast; diff --git a/crates/oq3_syntax/examples/promote.rs b/crates/oq3_syntax/examples/promote.rs index dacc863..7f26181 100644 --- a/crates/oq3_syntax/examples/promote.rs +++ b/crates/oq3_syntax/examples/promote.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 // Test validating types of arguments to binary ops. That is test if they are legal. // And compute the common type that they must be promoted to. diff --git a/crates/oq3_syntax/src/ast.rs b/crates/oq3_syntax/src/ast.rs index 3b58881..55931e2 100644 --- a/crates/oq3_syntax/src/ast.rs +++ b/crates/oq3_syntax/src/ast.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Abstract Syntax Tree, layered on top of untyped `SyntaxNode`s diff --git a/crates/oq3_syntax/src/ast/edit.rs b/crates/oq3_syntax/src/ast/edit.rs index b783c22..5a71d91 100644 --- a/crates/oq3_syntax/src/ast/edit.rs +++ b/crates/oq3_syntax/src/ast/edit.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This module contains functions for editing syntax trees. As the trees are //! immutable, all function here return a fresh copy of the tree, instead of diff --git a/crates/oq3_syntax/src/ast/expr_ext.rs b/crates/oq3_syntax/src/ast/expr_ext.rs index 577bb54..f805c47 100644 --- a/crates/oq3_syntax/src/ast/expr_ext.rs +++ b/crates/oq3_syntax/src/ast/expr_ext.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Various extension methods to ast Expr Nodes, which are hard to code-generate. //! diff --git a/crates/oq3_syntax/src/ast/generated.rs b/crates/oq3_syntax/src/ast/generated.rs index 0b29601..647f557 100644 --- a/crates/oq3_syntax/src/ast/generated.rs +++ b/crates/oq3_syntax/src/ast/generated.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This file is actually hand-written, but the submodules are indeed generated. #[rustfmt::skip] diff --git a/crates/oq3_syntax/src/ast/generated/nodes.rs b/crates/oq3_syntax/src/ast/generated/nodes.rs index 59926e5..636a3e2 100644 --- a/crates/oq3_syntax/src/ast/generated/nodes.rs +++ b/crates/oq3_syntax/src/ast/generated/nodes.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Generated by `sourcegen_ast`, do not edit by hand. diff --git a/crates/oq3_syntax/src/ast/generated/tokens.rs b/crates/oq3_syntax/src/ast/generated/tokens.rs index 7f6c13d..d117999 100644 --- a/crates/oq3_syntax/src/ast/generated/tokens.rs +++ b/crates/oq3_syntax/src/ast/generated/tokens.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Generated by `sourcegen_ast`, do not edit by hand. diff --git a/crates/oq3_syntax/src/ast/make.rs b/crates/oq3_syntax/src/ast/make.rs index ebe48a3..160b54a 100644 --- a/crates/oq3_syntax/src/ast/make.rs +++ b/crates/oq3_syntax/src/ast/make.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This module contains free-standing functions for creating AST fragments out //! of smaller pieces. diff --git a/crates/oq3_syntax/src/ast/node_ext.rs b/crates/oq3_syntax/src/ast/node_ext.rs index 81e2c6e..e0299b0 100644 --- a/crates/oq3_syntax/src/ast/node_ext.rs +++ b/crates/oq3_syntax/src/ast/node_ext.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Various extension methods to ast Nodes, which are hard to code-generate. //! Extensions for various expressions live in a sibling `expr_extensions` module. diff --git a/crates/oq3_syntax/src/ast/operators.rs b/crates/oq3_syntax/src/ast/operators.rs index 135bb91..f42e28b 100644 --- a/crates/oq3_syntax/src/ast/operators.rs +++ b/crates/oq3_syntax/src/ast/operators.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Defines a bunch of data-less enums for unary and binary operators. //! diff --git a/crates/oq3_syntax/src/ast/prec.rs b/crates/oq3_syntax/src/ast/prec.rs index f7a2dc8..75ce18b 100644 --- a/crates/oq3_syntax/src/ast/prec.rs +++ b/crates/oq3_syntax/src/ast/prec.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Precedence representation. diff --git a/crates/oq3_syntax/src/ast/token_ext.rs b/crates/oq3_syntax/src/ast/token_ext.rs index 4930858..5bf4e97 100644 --- a/crates/oq3_syntax/src/ast/token_ext.rs +++ b/crates/oq3_syntax/src/ast/token_ext.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! There are many AstNodes, but only a few tokens, so we hand-write them here. //! I assume "them" refers to tokens (GJL AUG 2023) diff --git a/crates/oq3_syntax/src/ast/traits.rs b/crates/oq3_syntax/src/ast/traits.rs index 4c4518b..2604c8d 100644 --- a/crates/oq3_syntax/src/ast/traits.rs +++ b/crates/oq3_syntax/src/ast/traits.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Various traits that are implemented by ast nodes. //! diff --git a/crates/oq3_syntax/src/ast/type_ext.rs b/crates/oq3_syntax/src/ast/type_ext.rs index 454b1bc..c527aac 100644 --- a/crates/oq3_syntax/src/ast/type_ext.rs +++ b/crates/oq3_syntax/src/ast/type_ext.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use crate::{ast, SyntaxToken, T}; diff --git a/crates/oq3_syntax/src/lib.rs b/crates/oq3_syntax/src/lib.rs index 566f25e..d949834 100644 --- a/crates/oq3_syntax/src/lib.rs +++ b/crates/oq3_syntax/src/lib.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Syntax Tree library used throughout the rust-analyzer. //! diff --git a/crates/oq3_syntax/src/parsing.rs b/crates/oq3_syntax/src/parsing.rs index 42b42e4..d4f77f5 100644 --- a/crates/oq3_syntax/src/parsing.rs +++ b/crates/oq3_syntax/src/parsing.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Lexing, bridging to parser (which does the actual parsing) and //! incremental reparsing. diff --git a/crates/oq3_syntax/src/ptr.rs b/crates/oq3_syntax/src/ptr.rs index 94aeb1a..5da617d 100644 --- a/crates/oq3_syntax/src/ptr.rs +++ b/crates/oq3_syntax/src/ptr.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! In rust-analyzer, syntax trees are transient objects. //! diff --git a/crates/oq3_syntax/src/syntax_error.rs b/crates/oq3_syntax/src/syntax_error.rs index 8901bf1..b3699c1 100644 --- a/crates/oq3_syntax/src/syntax_error.rs +++ b/crates/oq3_syntax/src/syntax_error.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! See docs for `SyntaxError`. diff --git a/crates/oq3_syntax/src/syntax_node.rs b/crates/oq3_syntax/src/syntax_node.rs index f8b4c46..2c38f02 100644 --- a/crates/oq3_syntax/src/syntax_node.rs +++ b/crates/oq3_syntax/src/syntax_node.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This module defines Concrete Syntax Tree (CST), used by rust-analyzer. //! diff --git a/crates/oq3_syntax/src/ted.rs b/crates/oq3_syntax/src/ted.rs index ff08846..fbe000e 100644 --- a/crates/oq3_syntax/src/ted.rs +++ b/crates/oq3_syntax/src/ted.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Primitive tree editor, ed for trees. //! diff --git a/crates/oq3_syntax/src/tests.rs b/crates/oq3_syntax/src/tests.rs index da9bd83..4f6c017 100644 --- a/crates/oq3_syntax/src/tests.rs +++ b/crates/oq3_syntax/src/tests.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 #[cfg(not(feature = "in-rust-tree"))] mod ast_src; diff --git a/crates/oq3_syntax/src/tests/ast_src.rs b/crates/oq3_syntax/src/tests/ast_src.rs index 8c74425..0d14ad8 100644 --- a/crates/oq3_syntax/src/tests/ast_src.rs +++ b/crates/oq3_syntax/src/tests/ast_src.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Defines input for code generation process. diff --git a/crates/oq3_syntax/src/tests/sourcegen_ast.rs b/crates/oq3_syntax/src/tests/sourcegen_ast.rs index 7350956..b3d4179 100644 --- a/crates/oq3_syntax/src/tests/sourcegen_ast.rs +++ b/crates/oq3_syntax/src/tests/sourcegen_ast.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This module generates AST datatype used by rust-analyzer. FIXME //! diff --git a/crates/oq3_syntax/src/token_text.rs b/crates/oq3_syntax/src/token_text.rs index 6b8e8ff..0577db7 100644 --- a/crates/oq3_syntax/src/token_text.rs +++ b/crates/oq3_syntax/src/token_text.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Yet another version of owned string, backed by a syntax tree token. diff --git a/crates/oq3_syntax/src/validation.rs b/crates/oq3_syntax/src/validation.rs index dd60a71..60b6782 100644 --- a/crates/oq3_syntax/src/validation.rs +++ b/crates/oq3_syntax/src/validation.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This module implements syntax validation that the parser doesn't handle. //! diff --git a/crates/oq3_syntax/src/validation/block.rs b/crates/oq3_syntax/src/validation/block.rs index 8b788d4..32e5e8c 100644 --- a/crates/oq3_syntax/src/validation/block.rs +++ b/crates/oq3_syntax/src/validation/block.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Logic for validating block expressions i.e. `ast::BlockExpr`. diff --git a/crates/parser/src/event.rs b/crates/parser/src/event.rs index b5a441f..3c6378b 100644 --- a/crates/parser/src/event.rs +++ b/crates/parser/src/event.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This module provides a way to construct a `File`. //! It is intended to be completely decoupled from the diff --git a/crates/parser/src/grammar.rs b/crates/parser/src/grammar.rs index b4ef204..42464c3 100644 --- a/crates/parser/src/grammar.rs +++ b/crates/parser/src/grammar.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This is the actual "grammar" of the OpenQASM 3 language. //! diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs index 79da403..fe51dfd 100644 --- a/crates/parser/src/grammar/expressions.rs +++ b/crates/parser/src/grammar/expressions.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 pub mod atom; diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs index 4bf3878..cf2b604 100644 --- a/crates/parser/src/grammar/expressions/atom.rs +++ b/crates/parser/src/grammar/expressions/atom.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use super::*; diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs index eac989e..718b0bc 100644 --- a/crates/parser/src/grammar/items.rs +++ b/crates/parser/src/grammar/items.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use super::*; use crate::grammar::expressions::expr_block_contents; diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs index 239b4b8..1a11d33 100644 --- a/crates/parser/src/grammar/params.rs +++ b/crates/parser/src/grammar/params.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use super::*; diff --git a/crates/parser/src/input.rs b/crates/parser/src/input.rs index 11a0e02..7d0cd0e 100644 --- a/crates/parser/src/input.rs +++ b/crates/parser/src/input.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! See [`Input`]. diff --git a/crates/parser/src/lexed_str.rs b/crates/parser/src/lexed_str.rs index d87e052..4245527 100644 --- a/crates/parser/src/lexed_str.rs +++ b/crates/parser/src/lexed_str.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Lexing `&str` into a sequence of OpenQASM 3 tokens. //! diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs index f78d722..3d1a3cf 100644 --- a/crates/parser/src/lib.rs +++ b/crates/parser/src/lib.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Parser for OpenQASM 3 diff --git a/crates/parser/src/output.rs b/crates/parser/src/output.rs index 20ba869..d446c5c 100644 --- a/crates/parser/src/output.rs +++ b/crates/parser/src/output.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! See [`Output`] diff --git a/crates/parser/src/parser.rs b/crates/parser/src/parser.rs index 194342a..b98063c 100644 --- a/crates/parser/src/parser.rs +++ b/crates/parser/src/parser.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! See [`Parser`]. diff --git a/crates/parser/src/shortcuts.rs b/crates/parser/src/shortcuts.rs index ad53319..7a09501 100644 --- a/crates/parser/src/shortcuts.rs +++ b/crates/parser/src/shortcuts.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Shortcuts that span lexer/parser abstraction. //! diff --git a/crates/parser/src/syntax_kind.rs b/crates/parser/src/syntax_kind.rs index 9865a50..8cd3934 100644 --- a/crates/parser/src/syntax_kind.rs +++ b/crates/parser/src/syntax_kind.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Defines [`SyntaxKind`] -- a fieldless enum of all possible syntactic //! constructs of the OpenQASM 3 language. diff --git a/crates/parser/src/syntax_kind/syntax_kind_enum.rs b/crates/parser/src/syntax_kind/syntax_kind_enum.rs index c78381f..02e19c3 100644 --- a/crates/parser/src/syntax_kind/syntax_kind_enum.rs +++ b/crates/parser/src/syntax_kind/syntax_kind_enum.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Generated by `sourcegen_ast`, do not edit by hand. diff --git a/crates/parser/src/token_set.rs b/crates/parser/src/token_set.rs index c0fb463..c28fac7 100644 --- a/crates/parser/src/token_set.rs +++ b/crates/parser/src/token_set.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! A bit-set of `SyntaxKind`s. diff --git a/crates/semantics/examples/semdemo.rs b/crates/semantics/examples/semdemo.rs index 3c99a68..3afa3b4 100644 --- a/crates/semantics/examples/semdemo.rs +++ b/crates/semantics/examples/semdemo.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use clap::{Parser, Subcommand}; use std::fs; diff --git a/crates/semantics/src/asg.rs b/crates/semantics/src/asg.rs index 7371f1c..66e0c92 100644 --- a/crates/semantics/src/asg.rs +++ b/crates/semantics/src/asg.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 // The definition of the abstract semantic graph (ASG) as well as the API for using it. // Construction of this typed ASG from syntactic AST is in string_to_semantic.rs. diff --git a/crates/semantics/src/context.rs b/crates/semantics/src/context.rs index e68cd4d..792a728 100644 --- a/crates/semantics/src/context.rs +++ b/crates/semantics/src/context.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use crate::asg; use crate::semantic_error::SemanticErrorKind::*; diff --git a/crates/semantics/src/display.rs b/crates/semantics/src/display.rs index 2ad6fd4..62c29d0 100644 --- a/crates/semantics/src/display.rs +++ b/crates/semantics/src/display.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 // Unused at the moment. // This intent here is to print something like source code. diff --git a/crates/semantics/src/initialize_ast.rs b/crates/semantics/src/initialize_ast.rs index 2355299..3289bae 100644 --- a/crates/semantics/src/initialize_ast.rs +++ b/crates/semantics/src/initialize_ast.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use crate::asg; use crate::symbols; diff --git a/crates/semantics/src/lib.rs b/crates/semantics/src/lib.rs index f6184ce..3a538e0 100644 --- a/crates/semantics/src/lib.rs +++ b/crates/semantics/src/lib.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Abstract Semantic Graph (ASG) //! This crate implements an abstract semantic graph (ASG) for the OpenQASM 3 language. diff --git a/crates/semantics/src/semantic_error.rs b/crates/semantics/src/semantic_error.rs index 18279f2..0caac08 100644 --- a/crates/semantics/src/semantic_error.rs +++ b/crates/semantics/src/semantic_error.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 // This is copied and modified from rust-analyzer syntax_error.rs use oq3_syntax::AstNode; diff --git a/crates/semantics/src/symbols.rs b/crates/semantics/src/symbols.rs index c7af62d..e4615be 100644 --- a/crates/semantics/src/symbols.rs +++ b/crates/semantics/src/symbols.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 // Defines data structures and api for symbols, scope, and symbol tables. diff --git a/crates/semantics/src/syntax_to_semantics.rs b/crates/semantics/src/syntax_to_semantics.rs index b54f2ab..582174e 100644 --- a/crates/semantics/src/syntax_to_semantics.rs +++ b/crates/semantics/src/syntax_to_semantics.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 // Build the ASG defined in asg.rs from the syntactic AST // constructed in the crate oq3_syntax. diff --git a/crates/semantics/src/types.rs b/crates/semantics/src/types.rs index dee48d5..bae069b 100644 --- a/crates/semantics/src/types.rs +++ b/crates/semantics/src/types.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 // Defines the data structures representing the types used to annotate types of expressions in // the typed ASG. diff --git a/crates/semantics/src/utils.rs b/crates/semantics/src/utils.rs index 5ca7bba..8623b52 100644 --- a/crates/semantics/src/utils.rs +++ b/crates/semantics/src/utils.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 /// Return the name of the type of a value. pub fn type_name_of(_: T) -> &'static str { diff --git a/crates/semantics/src/validate.rs b/crates/semantics/src/validate.rs index 7bd4214..2d23cda 100644 --- a/crates/semantics/src/validate.rs +++ b/crates/semantics/src/validate.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use crate::asg::{Expr, Program, Stmt, TExpr}; use crate::symbols::{SymbolIdResult, SymbolTable}; diff --git a/crates/semantics/tests/ast_tests.rs b/crates/semantics/tests/ast_tests.rs index edb60ea..a94841c 100644 --- a/crates/semantics/tests/ast_tests.rs +++ b/crates/semantics/tests/ast_tests.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use semantics; use semantics::asg; diff --git a/crates/semantics/tests/from_string_tests.rs b/crates/semantics/tests/from_string_tests.rs index 937d482..39cf0ab 100644 --- a/crates/semantics/tests/from_string_tests.rs +++ b/crates/semantics/tests/from_string_tests.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use semantics::asg; use semantics::semantic_error::SemanticErrorList; diff --git a/crates/semantics/tests/symbol_tests.rs b/crates/semantics/tests/symbol_tests.rs index 2f611ed..189c6c7 100644 --- a/crates/semantics/tests/symbol_tests.rs +++ b/crates/semantics/tests/symbol_tests.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use semantics::symbols; use semantics::types; diff --git a/crates/semantics/tests/types_test.rs b/crates/semantics/tests/types_test.rs index e6be300..bb82fcd 100644 --- a/crates/semantics/tests/types_test.rs +++ b/crates/semantics/tests/types_test.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use semantics::types; diff --git a/crates/source_file/src/api.rs b/crates/source_file/src/api.rs index 2f178ac..acbc191 100644 --- a/crates/source_file/src/api.rs +++ b/crates/source_file/src/api.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 // It might be nice to put these functions in lib.rs. // But they are also used in this crate, so we put them here. diff --git a/crates/source_file/src/lib.rs b/crates/source_file/src/lib.rs index 1f8c2fb..3c4491b 100644 --- a/crates/source_file/src/lib.rs +++ b/crates/source_file/src/lib.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! Management of source files for OpenQASM 3 parsing and semantic analysis. The main `struct` here //! is `SourceFile` which contains the path to a source file and the AST produced by the parser. It diff --git a/crates/source_file/src/source_file.rs b/crates/source_file/src/source_file.rs index 3552ec7..393cc08 100644 --- a/crates/source_file/src/source_file.rs +++ b/crates/source_file/src/source_file.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 use oq3_syntax::ast as synast; // Syntactic AST use oq3_syntax::Parse; diff --git a/crates/sourcegen/src/lib.rs b/crates/sourcegen/src/lib.rs index d48fbbc..1916bc8 100644 --- a/crates/sourcegen/src/lib.rs +++ b/crates/sourcegen/src/lib.rs @@ -1,4 +1,5 @@ // Copyright contributors to the openqasm-parser project +// SPDX-License-Identifier: Apache-2.0 //! This was copied from an external crate. It would be better to use the //! external crate. But it has a bug-- a hard coded path that requires the diff --git a/run_rustfmt.sh b/run_rustfmt.sh index a68a57d..fedf107 100755 --- a/run_rustfmt.sh +++ b/run_rustfmt.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # Ideally we want to run rustfmt on all crates cd crates/source_file && cargo fmt && cd ../.. diff --git a/run_tests.sh b/run_tests.sh index 9be8ec0..d8fb249 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # Run the tests, but skip the tests that do codegen. They currently # are breaking the source. Or may break it. diff --git a/run_tests_less.sh b/run_tests_less.sh index 25edaf1..d9eef64 100755 --- a/run_tests_less.sh +++ b/run_tests_less.sh @@ -1,6 +1,7 @@ #!/bin/env sh # Copyright contributors to the openqasm-parser project +# SPDX-License-Identifier: Apache-2.0 # Same as run_tests.sh, but pipe stderr to less From 1fd32ce04f6c7f4f8069c3ab10c13da5f6f29971 Mon Sep 17 00:00:00 2001 From: John Lapeyre Date: Fri, 12 Jan 2024 16:13:49 -0500 Subject: [PATCH 3/6] Add script to run CI locally * This is the same CI that runs remotely automatically with PRs. This is a posix shell script. * Remove a bit of cruft as well --- .gitignore | 1 + local_CI.sh | 6 ++++++ rust-toolchain.toml | 2 -- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 local_CI.sh diff --git a/.gitignore b/.gitignore index a4fc2d6..34d63e0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ crates/oq3_syntax/src/ast/generated/_new_tokens.rs .env/ .envs/ .ackrc +save/ diff --git a/local_CI.sh b/local_CI.sh new file mode 100644 index 0000000..c69437e --- /dev/null +++ b/local_CI.sh @@ -0,0 +1,6 @@ +#!/bin/env sh + +# Run locally the same checks that are done remotely in CI +# Works on linux, and maybe Mac OS. + +cargo fmt --all -- --check && cargo build --verbose && cargo clippy -- -D warnings && cargo test --verbose -- --skip sourcegen_ast --skip sourcegen_ast_nodes diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e9fb493..ba6b123 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -3,8 +3,6 @@ # Copyright contributors to the openqasm-parser project -# FIXME: Our min required version is > than 1.64.0 - channel = "1.70.0" components = [ "cargo", From b78ecb308a77d754027fd37cc27312e21d481da6 Mon Sep 17 00:00:00 2001 From: John Lapeyre Date: Fri, 12 Jan 2024 17:17:39 -0500 Subject: [PATCH 4/6] Use standard path to env in shell script --- local_CI.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 local_CI.sh diff --git a/local_CI.sh b/local_CI.sh old mode 100644 new mode 100755 index c69437e..81c99c0 --- a/local_CI.sh +++ b/local_CI.sh @@ -1,4 +1,4 @@ -#!/bin/env sh +#!/usr/bin/env sh # Run locally the same checks that are done remotely in CI # Works on linux, and maybe Mac OS. From 93d79abad47dda49f2633b52ec6e5b019ae3e2f2 Mon Sep 17 00:00:00 2001 From: John Lapeyre Date: Fri, 12 Jan 2024 17:17:56 -0500 Subject: [PATCH 5/6] Remove local and outdated excludes from .gitignore --- .gitignore | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.gitignore b/.gitignore index 34d63e0..3c4b1cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,5 @@ target/ /Cargo.lock -dev_docs/diagrams -crates/oq3_syntax/examples/oq3_source -crates/oq3_syntax/examples/hideold -organization.md -parser_design.md -restorenodes.sh -restorgenerated.sh crates/parser/src/syntax_kind/_syntax_kind_enum.rs crates/oq3_syntax/src/ast/generated/_new_nodes.rs crates/oq3_syntax/src/ast/generated/_new_tokens.rs -.venv/ -.venvs/ -.env/ -.envs/ -.ackrc -save/ From eb737393c975fd78dc17d0237266f2e8c8c9a4c6 Mon Sep 17 00:00:00 2001 From: John Lapeyre Date: Fri, 12 Jan 2024 22:49:36 -0500 Subject: [PATCH 6/6] Rationalize dependencies in Cargo.toml files * Remove unused dependencies * Move dependencies for single crates from workspace Cargo.toml to crate Cargo.toml * Remove cruft and comments from Cargo.toml files and fix formatting a bit --- Cargo.toml | 15 --------------- crates/oq3_syntax/Cargo.toml | 26 ++++++-------------------- crates/parser/Cargo.toml | 5 +---- crates/semantics/Cargo.toml | 2 +- crates/source_file/Cargo.toml | 2 -- 5 files changed, 8 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index cbcfdff..4e4681b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,18 +16,3 @@ oq3_syntax = { path = "./crates/oq3_syntax", version = "0.0.0" } semantics = { path = "./crates/semantics", version = "0.0.0" } source_file = { path = "./crates/source_file", version = "0.0.0" } sourcegen = { path = "./crates/sourcegen", version = "0.0.0" } - -# non-local crates -limit = { version = "0.0.188", package = "ra_ap_limit" } -stdx = { version = "0.0.188", package = "ra_ap_stdx"} -triomphe = { version = "0.1.8", default-features = false, features = ["std"] } -smallvec = { version = "1.10.0", features = [ - "const_new", - "union", - "const_generics", -] } -smol_str = "0.2.0" -nohash-hasher = "0.2.0" -text-size = "1.1.0" -# can't upgrade due to dashmap depending on 0.12.3 currently -hashbrown = { version = "0.12.3", features = ["inline-more"], default-features = false } diff --git a/crates/oq3_syntax/Cargo.toml b/crates/oq3_syntax/Cargo.toml index 0525caf..34f1be6 100644 --- a/crates/oq3_syntax/Cargo.toml +++ b/crates/oq3_syntax/Cargo.toml @@ -12,26 +12,22 @@ rust-version.workspace = true doctest = false [dependencies] - # external crates cov-mark = "2.0.0-pre.1" either = "1.7.0" +indexmap = "2.0.0" itertools = "0.10.5" +once_cell = "1.17.0" rowan = "0.15.11" rustc-hash = "1.1.0" -once_cell = "1.17.0" -indexmap = "2.0.0" -smol_str.workspace = true -triomphe.workspace = true +smol_str = "0.2.0" +triomphe = { version = "0.1.8", default-features = false, features = ["std"] } # local crates - -# rustc_lexer.workspace = true lexer.workspace = true parser.workspace = true -# profile.workspace = true -stdx.workspace = true -# text-edit.workspace = true +sourcegen.workspace = true +stdx = { version = "0.0.188", package = "ra_ap_stdx"} [dev-dependencies] rayon = "1.6.1" @@ -40,13 +36,3 @@ proc-macro2 = "1.0.47" quote = "1.0.20" ungrammar = "1.16.1" clap = { version = "4.0", features = ["derive"] } - -# local crate - -sourcegen.workspace = true - -# This brings in tons of things -#test-utils.workspace = true - -# [features] -# in-rust-tree = [] diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml index ca12033..c97b2b9 100644 --- a/crates/parser/Cargo.toml +++ b/crates/parser/Cargo.toml @@ -3,16 +3,13 @@ name = "parser" version = "0.1.0" edition = "2021" -# Added this explicit target just so I could disable the doc tests (GJL Sept 2023) [lib] -name = "parser" doctest = false [dependencies] lexer.workspace = true drop_bomb = "0.1.5" - -limit.workspace = true +limit = { version = "0.0.188", package = "ra_ap_limit" } [dev-dependencies] expect-test = "1.4.0" diff --git a/crates/semantics/Cargo.toml b/crates/semantics/Cargo.toml index 45184b5..3256192 100644 --- a/crates/semantics/Cargo.toml +++ b/crates/semantics/Cargo.toml @@ -12,10 +12,10 @@ rust-version.workspace = true doctest = false [dependencies] +oq3_syntax.workspace = true source_file.workspace = true hashbrown = { version = "0.14" } rowan = "0.15.11" -oq3_syntax.workspace = true boolenum = "0.1" [dev-dependencies] diff --git a/crates/source_file/Cargo.toml b/crates/source_file/Cargo.toml index 76ade12..0b49bf8 100644 --- a/crates/source_file/Cargo.toml +++ b/crates/source_file/Cargo.toml @@ -14,7 +14,5 @@ doctest = false [dependencies] ariadne = { version = "0.3.0", features = ["auto-color"] } oq3_syntax.workspace = true - source-span = { version = "2.7.0" } -[dev-dependencies]