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.

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

Psych.loadの引数filenameの追従 #2870

Merged
merged 4 commits into from
May 9, 2024

Conversation

nishidayuya
Copy link
Contributor

@nishidayuya nishidayuya commented Feb 8, 2024

以下の対応を行いました.

  • 5fa1ea2 ruby-2.6.0でキーワード引数filenameが使えるようになったことに追従
  • f218650 ruby-3.1で第二引数filenameがなくなったことに追従

動作確認

以下のようになることを確認しました.

ruby-3.1

image

ruby-3.0

image

ruby-2.6.0

image

ruby-2.5.0

image

ruby-2.4.0

image

@@ -113,7 +113,16 @@ libyaml のバージョンを返します。
@see [[m:Psych::LIBYAML_VERSION]]

#@since 2.5.0
#@since 2.6.0
#@since 3.1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

このあたりの分岐についてはより良い方法がありましたらご教示ください

Copy link

@shugo shugo Feb 9, 2024

Choose a reason for hiding this comment

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

こんな感じですかね

#@if("2.6.0" <= version)
--- load(yaml, filename: nil, fallback: false, symbolize_names: false) -> object
#@end
#@if("2.5.0" <= version and version < "3.1")
--- load(yaml, filename = nil, fallback: false, symbolize_names: false) -> object
#@end
#@if(version < "2.5.0")
--- load(yaml, filename = nil, fallback = false) -> object
#@end

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ご提示ありがとうございました. 7f8b1c9 として積ませていただきました.

@nishidayuya nishidayuya changed the title Psych.loadのキーワード引数filenameの追従 Psych.loadの引数filenameの追従 Feb 8, 2024
@nishidayuya nishidayuya force-pushed the follow_psych_load_argument_change branch 2 times, most recently from 2cd5605 to 0acb12d Compare May 9, 2024 00:51
Copy link
Member

@znz znz left a comment

Choose a reason for hiding this comment

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

ありがとうございます。

@znz znz merged commit e00d53b into rurema:master May 9, 2024
2 of 8 checks passed
@nishidayuya
Copy link
Contributor Author

ご確認ありがとうございました.

CIが通らなかった点を調べないとなどと考えていましたが, 58b73ef で修正されたと見受けました.ご対応ありがとうございました. 🙇

@nishidayuya nishidayuya deleted the follow_psych_load_argument_change branch May 14, 2024 02:56
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.

3 participants