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

Maintenance/stdlib #1600

Merged
merged 1 commit into from
Sep 29, 2024
Merged

Maintenance/stdlib #1600

merged 1 commit into from
Sep 29, 2024

Conversation

christianparpart
Copy link
Member

@christianparpart christianparpart commented Sep 22, 2024

CHECKLIST BEFORE MERGE

  • resolve review items
  • have dependency git tags updates to their newly released versions

How:

# fish shell syntax

for file in (git grep fmt/format | cut -d: -f1); sed -i -e 's,include <fmt/format.h>,include <format>,' $file; end
for file in (git grep fmt:: | cut -d: -f1); sed -i -e 's,fmt::,std::,g' $file; end
for file in (git grep std::print | cut -d: -f1); sed -i -e 's,std::print,std::cout << std::format,g' $file; end

# replace `std::print` with `std::cout << std::format`

## tidy-up
find src \( -name '*.cpp' -o -name '*.h' \) -exec clang-format -i {} \;

misc notes

  • check statusline's time in %H:%S is working correctly
  • some lines wrt. fmt::runtime() have been rewritten
  • fmt::arg() rewritten for std::format()
  • Also fix timestamps in debug logs

Closes #1598

@github-actions github-actions bot added VT: Backend Virtual Terminal Backend (libterminal API) frontend Contour Terminal Emulator (GUI frontend) test Unit tests VT: rasterizer Rendering of the terminal into a pixmap using `terminal_renderer` library fonts font rasterization and text shaping API and platform implementations labels Sep 22, 2024
Copy link
Member

@Yaraslaut Yaraslaut left a comment

Choose a reason for hiding this comment

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

Few small things to consider,
I think that we can switch in this PR to c++23 and use std::print

examples/watch-mouse-events.cpp Show resolved Hide resolved
scripts/install-deps.sh Outdated Show resolved Hide resolved
src/contour/Actions.h Outdated Show resolved Hide resolved
src/contour/Config.cpp Outdated Show resolved Hide resolved
src/contour/Config.h Outdated Show resolved Hide resolved
src/crispy/CLI.cpp Outdated Show resolved Hide resolved
src/vtbackend/StatusLineBuilder.cpp Outdated Show resolved Hide resolved
@christianparpart christianparpart force-pushed the maintenance/stdlib branch 2 times, most recently from 05deba5 to 88ad5c7 Compare September 23, 2024 17:03
@github-actions github-actions bot added the CI GitHub Actions & CI label Sep 23, 2024
@christianparpart christianparpart force-pushed the maintenance/stdlib branch 10 times, most recently from 2bd1e14 to 0d594c2 Compare September 24, 2024 13:06
@github-actions github-actions bot added the CMake label Sep 24, 2024
@christianparpart christianparpart force-pushed the maintenance/stdlib branch 6 times, most recently from 026abfe to 29c61f9 Compare September 29, 2024 09:43
Other changes:

- [crispy] App: Changes log timestamps to print time in local time
- Drop Ubuntu 20.04 and Ubuntu 22.04 CI pipline building and tests

Signed-off-by: Christian Parpart <christian@parpart.family>
Copy link
Member

@Yaraslaut Yaraslaut left a comment

Choose a reason for hiding this comment

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

Many thanks, I think we can merge it
just one file in scripts not sure that we need it

Copy link
Member

Choose a reason for hiding this comment

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

we can use install-deps.sh to get all dependencies, why this file?

Copy link
Member Author

@christianparpart christianparpart Sep 29, 2024

Choose a reason for hiding this comment

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

we call it twice. I'd prefer to maintain the actual dependencies to install in as few locations as possible :)

@christianparpart
Copy link
Member Author

Which file? I am in the forest right now. It's hard to check on the phone :)

@Yaraslaut
Copy link
Member

Which file? I am in the forest right now. It's hard to check on the phone :)

scripts/ci-install-run-deps.sh :)

@christianparpart christianparpart merged commit 62b749b into master Sep 29, 2024
31 checks passed
@christianparpart christianparpart deleted the maintenance/stdlib branch September 29, 2024 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI GitHub Actions & CI CMake fonts font rasterization and text shaping API and platform implementations frontend Contour Terminal Emulator (GUI frontend) test Unit tests VT: Backend Virtual Terminal Backend (libterminal API) VT: rasterizer Rendering of the terminal into a pixmap using `terminal_renderer` library
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error when starting contour.
2 participants