Skip to content

implemented buildMap todo for kotlin#1717

Merged
bendk merged 3 commits intomozilla:mainfrom
Dmitry-Borodin:kotlin_buildMap
Sep 27, 2023
Merged

implemented buildMap todo for kotlin#1717
bendk merged 3 commits intomozilla:mainfrom
Dmitry-Borodin:kotlin_buildMap

Conversation

@Dmitry-Borodin
Copy link
Contributor

there was todo to use buildMap, it is stable since Kotlin 1.6
implemented todo

note - I was not able to run tests from doker image with

error: failed to open: /mounted_workdir/target/debug/.cargo-lock
Caused by:
  Permission denied (os error 13)

But I hope they will run in PR flow now.

@Dmitry-Borodin Dmitry-Borodin requested a review from a team as a code owner August 22, 2023 12:41
@Dmitry-Borodin Dmitry-Borodin requested review from tarikeshaq and removed request for a team August 22, 2023 12:41
Comment on lines +5 to +6
return buildMap<{{ key_type_name }}, {{ value_type_name }}> {
val len = buf.getInt()
Copy link
Contributor

Choose a reason for hiding this comment

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

There is a buildMap variant that takes a capacity parameter and should be more performant, maybe the len value could be used for that?

val len = buf.getInt()
return buildMap<{{ key_type_name }}, {{ value_type_name }}>(len) {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you, didn't notice that. Fixed.

@Dmitry-Borodin
Copy link
Contributor Author

build failing because of rust dependencies

error: package `clap_derive v4.4.0` cannot be built because it requires rustc 1.70.0 or newer, while the currently active rustc version is 1.69.0
Either upgrade to rustc 1.70.0 or newer, or use
cargo update -p clap_derive@4.4.0 --precise ver
where `ver` is the latest version of `clap_derive` supporting rustc 1.69.0

@badboy
Copy link
Member

badboy commented Aug 27, 2023

If you rebase on main CI will pass (#1720 landed)

Copy link
Contributor

@bendk bendk left a comment

Choose a reason for hiding this comment

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

CI is passing, let's take this.

@bendk bendk merged commit 93fbfb2 into mozilla:main Sep 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants