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

Jump to bottom

[smart_holder] git merge master #5402

Merged
merged 3 commits into from
Oct 8, 2024
Merged

[smart_holder] git merge master #5402

merged 3 commits into from
Oct 8, 2024

Commits on Oct 8, 2024

  1. Print key in KeyError in map.__getitem__/__delitem__ (pybind#5397) 

    * Print key in map.getitem/delitem KeyError

* Add tests

* Fix tests

* Make robust

* Make clang-tidy happy

* Return a Python str

* Show beginning and end of the message

* Avoid implicit conversion

* Split out `format_message_key_error_key_object()` to reduce amount of templated code.

* Use `"✄✄✄"` instead of `"..."`

Also rename variable to `cut_length`, to not get into even/odd issues with the meaning of "half".

---------

Co-authored-by: Ralf W. Grosse-Kunstleve <[email protected]>
    @sarlinpe @rwgk
    sarlinpe and rwgk authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    56e69a2 View commit details
    Browse the repository at this point in the history

  2. docs/advanced A document about deadlock potential with C++ statics (p… 

    …ybind#5394)

* [docs/advanced] A document about deadlock potential with C++ statics

* [docs/advanced] Refer to deadlock.md from misc.rst

* [docs/advanced] Fix tables in deadlock.md

* Use :ref:`deadlock-reference-label`

* Revert "Use :ref:`deadlock-reference-label`"

This reverts commit e5734d2.

* Add simple references to docs/advanced/deadlock.md filename. (Maybe someone can work on clickable links later.)

---------

Co-authored-by: Ralf W. Grosse-Kunstleve <[email protected]>
    @tkoeppe @rwgk
    tkoeppe and rwgk authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    af67e87 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into sh_merge_master

    @rwgk
    rwgk committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    973c1e0 View commit details
    Browse the repository at this point in the history