Skip to content

Commit

Permalink
Update pest 2.4.0 => 2.7.4 (#304)
Browse files Browse the repository at this point in the history
## What is the goal of this PR?

We update to pest and pest-derive v2.7.4, which among other things purports to fix the error where [deriving Parser fails on "undeclared crate or module `alloc`"](pest-parser/pest#899) (pest-parser/pest#900).

## What are the changes implemented in this PR?

We also clean up some compile warnings (unused imports and hashes).
  • Loading branch information
dmitrii-ubskii authored Oct 2, 2023
1 parent 1e0b187 commit 6dce697
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion dependencies/vaticle/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def vaticle_dependencies():
git_repository(
name = "vaticle_dependencies",
remote = "https://github.com/vaticle/dependencies",
commit = "cca04c5dfcff32e09f9e74d4e0aa90acbd023c23", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
commit = "fcc9a56b65e6ab69bbf0f1680affe38e12617ed6", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
)

def vaticle_typedb_common():
Expand Down
14 changes: 7 additions & 7 deletions rust/parser/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ use crate::{
filter, gte, lt, lte, min, not, or, parse_definables, parse_label, parse_pattern, parse_patterns, parse_queries,
parse_query, parse_variable,
pattern::{
Annotation::Key, ConceptVariableBuilder, Conjunction, Disjunction, ExpressionBuilder, Label,
RelationVariableBuilder, ThingVariableBuilder, TypeVariableBuilder, ValueVariableBuilder, Variable,
Annotation::Key, ConceptVariableBuilder, ExpressionBuilder, Label, RelationVariableBuilder,
ThingVariableBuilder, TypeVariableBuilder, ValueVariableBuilder, Variable,
},
query::{AggregateQueryBuilder, TypeQLDefine, TypeQLInsert, TypeQLMatch, TypeQLUndefine},
query::AggregateQueryBuilder,
rel, rule, sort_vars, type_, typeql_insert, typeql_match, Query,
};

Expand Down Expand Up @@ -436,9 +436,9 @@ $a == ?x isa age;"#;

#[test]
fn test_parsing_variable_name_clash_throws() {
let query = r#"match\n
let query = r"match\n
$z isa person, has age $y;
?y = $y;"#;
?y = $y;";

let parsed = parse_query(query);
assert!(parsed.is_err());
Expand Down Expand Up @@ -1690,7 +1690,7 @@ digit sub attribute,
regex "\d";"#;

let parsed = parse_query(query).unwrap().into_define();
let expected = typeql_define!(type_("digit").sub("attribute").regex(r#"\d"#));
let expected = typeql_define!(type_("digit").sub("attribute").regex(r"\d"));

assert_valid_eq_repr!(expected, parsed, query);
}
Expand All @@ -1701,7 +1701,7 @@ fn undefine_attribute_type_regex() {
digit regex "\d";"#;

let parsed = parse_query(query).unwrap().into_undefine();
let expected = typeql_undefine!(type_("digit").regex(r#"\d"#));
let expected = typeql_undefine!(type_("digit").regex(r"\d"));
assert_valid_eq_repr!(expected, parsed, query);
}

Expand Down
2 changes: 1 addition & 1 deletion rust/pattern/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use crate::{
and,
builder::cvar,
not, or, parse_query,
pattern::{Conjunction, Disjunction, Normalisable, ThingVariableBuilder},
pattern::{Disjunction, Normalisable, ThingVariableBuilder},
};

#[test]
Expand Down

0 comments on commit 6dce697

Please sign in to comment.