Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump indexmap to 2.0 #288

Merged
merged 2 commits into from
Oct 8, 2023
Merged

bump indexmap to 2.0 #288

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7c8112
bump `indexmap` to 2.0
hzlinyiyu-netease Oct 7, 2023
3e7f957
Merge branch 'main' into dev/indexmap
Kampfkarren Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- The following fields/variants have been changed from `Expression` to `Box<Expression>`: `Prefix::Expression`, `Var::Expression`, `IfExpression::condition`, `IfExpression::if_expression`, `IfExpression::else_expression`.
- When using serde, `Expression` will no longer act untagged.
- Fixed parsing of string interpolation double brace for Luau code
- Bump `indexmap` to 2.0

## [0.18.1] - 2023-03-19
### Fixed
Expand Down
4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
members = [
"full-moon",
"full-moon-derive",
]
]

resolver = "2"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't need this, right? edition = "2021" implies resolver = "2"

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, lame...

warning: some crates are on edition 2021 which defaults to `resolver = "2"`, but virtual workspaces default to `resolver = "1"`
note: to keep the current resolver, specify `workspace.resolver = "1"` in the workspace root's manifest
note: to use the edition 2021 resolver, specify `workspace.resolver = "2"` in the workspace root's manifest

2 changes: 1 addition & 1 deletion full-moon-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
proc-macro = true

[dependencies]
indexmap = "1.9"
indexmap = "2.0.2"
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "1.0.107", features = ["extra-traits"] }
2 changes: 1 addition & 1 deletion full-moon/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ smol_str = { version = "0.1.23", features = ["serde"] }
stacker = { version = "0.1.15", optional = true }

[dev-dependencies]
criterion = "0.4"
criterion = "0.5.1"
insta = { version = "1.26.0", features = ["glob", "yaml"] }
pretty_assertions = "1.3.0"

Expand Down