Merge branch 'upstream' of github.com:kassane/fmt into zig-pkg

kassane · May 27, 2024 · 1023846 · 1023846
2 parents 27b975b + 529dcd1
commit 1023846
Show file tree

Hide file tree

Showing 201 changed files with 11,537 additions and 8,598 deletions.
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
@@ -23,7 +23,7 @@ jobs:
         dry-run: false
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,10 +13,10 @@ jobs:
   format_code:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
     - name: Install clang-format
-      uses: aminya/setup-cpp@v1
+      uses: aminya/setup-cpp@290824452986e378826155f3379d31bce8753d76 # v0.37.0
       with:
         clangformat: 17.0.5
 

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -52,14 +52,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
         with:
           sarif_file: results.sarif
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -341,6 +341,12 @@ endif ()
 add_library(fmt-header-only INTERFACE)
 add_library(fmt::fmt-header-only ALIAS fmt-header-only)
 
+if (MSVC)
+  # Unicode support requires compiling with /utf-8.
+  target_compile_options(fmt PUBLIC /utf-8)
+  target_compile_options(fmt-header-only INTERFACE /utf-8)
+endif ()
+
 target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
 target_compile_features(fmt-header-only INTERFACE cxx_std_11)
 

diff --git a/doc/_static/bootstrap.min.js b/doc/_static/bootstrap.min.js
diff --git a/doc/_static/breathe.css b/doc/_static/breathe.css
@@ -14,15 +14,3 @@
 .container .breathe-sectiondef {
   width: inherit;
 }
-
-.github-btn {
-  border: 0;
-  overflow: hidden;
-}
-
-.jumbotron {
-  background-size: 100% 4px;
-  background-repeat: repeat-y;
-  color: white;
-  text-align: center;
-}
diff --git a/doc/_static/popper.min.js b/doc/_static/popper.min.js
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -1,20 +1,19 @@
 {% extends "!layout.html" %}
 
-{% block extrahead %}
-<meta name="description" content="Small, safe and fast formatting library">
-<meta name="keywords" content="C++, formatting, printf, string, library">
-<meta name="author" content="Victor Zverovich">
-<link rel="stylesheet" href="_static/fmt.css">
-{# Google Analytics #}
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-20116650-4"></script>
-<script>
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-
-  gtag('config', 'UA-20116650-4');
-</script>
-{% endblock %}
+{%- block extrahead %}
+    <meta name="description" content="A modern formatting library">
+    <meta name="keywords" content="C++, formatting, printf, string, library">
+    <meta name="author" content="Victor Zverovich">
+    <link rel="stylesheet" href="_static/fmt.css">
+    {# Google Analytics #}
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-20116650-4"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag() { dataLayer.push(arguments); }
+      gtag('js', new Date());
+      gtag('config', 'UA-20116650-4');
+    </script>
+{%- endblock %}
 
 {%- macro searchform(classes, button) %}
 <form class="{{classes}}" role="search" action="{{ pathto('search') }}"
@@ -32,74 +31,68 @@
 {%- endmacro %}
 
 {% block header %}
-<nav class="navbar navbar-inverse">
-  <div class="tb-container">
-    <div class="row">
-      <div class="navbar-content">
-        {# Brand and toggle get grouped for better mobile display #}
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed"
-                  data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="index.html">{fmt}</a>
-        </div>
-
-        {# Collect the nav links, forms, and other content for toggling #}
-        <div class="collapse navbar-collapse">
-          <ul class="nav navbar-nav">
-            <li class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown"
-                 role="button" aria-expanded="false">{{ version }}
-                <span class="caret"></span></a>
-              <ul class="dropdown-menu" role="menu">
-                {% for v in versions.split(',') %}
-                <li><a href="https://fmt.dev/{{v}}">{{v}}</a></li>
-                {% endfor %}
-              </ul>
+<nav class="navbar navbar-expand-md">
+  <div class="container">
+    <a class="navbar-brand" href="index.html">{fmt}</a>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
+            data-bs-target="#navbarSupportedContent"
+            aria-controls="navbarSupportedContent" aria-expanded="false"
+            aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" role="button"
+             data-bs-toggle="dropdown" aria-expanded="false">
+            {{ version }}
+          </a>
+          <ul class="dropdown-menu">
+            {% for v in versions.split(',') %}
+            <li>
+              <a class="dropdown-item" href="https://fmt.dev/{{v}}">{{v}}</a>
             </li>
-            {% for name in ['Contents', 'Usage', 'API', 'Syntax'] %}
-              {% if pagename == name.lower() %}
-              <li class="active"><a href="{{name.lower()}}.html">{{name}}
-                <span class="sr-only">(current)</span></a></li>
-              {%else%}
-              <li><a href="{{name.lower()}}.html">{{name}}</a></li>
-              {%endif%}
             {% endfor %}
           </ul>
-          {% if pagename != 'search' %}
-            {{ searchform('navbar-form navbar-right', False) }}
+        </li>
+        {% for name in ['Contents', 'Usage', 'API', 'Syntax'] %}
+          <li class="nav-item">
+          {% if pagename == name.lower() %}
+            <a class="nav-link active" aria-current="page"
+               href="{{name.lower()}}.html">{{name}}
+            </a>
+          {%else%}
+            <a class="nav-link" href="{{name.lower()}}.html">{{name}}</a>
           {%endif%}
-        </div> {# /.navbar-collapse #}
-      </div> {# /.col-md-offset-2 #}
-    </div> {# /.row #}
-  </div> {# /.tb-container #}
+          </li>
+        {% endfor %}
+      </ul>
+      {% if pagename != 'search' %}
+        {{ searchform('navbar-form navbar-right', False) }}
+      {%endif%}
+    </div>
+  </div>
 </nav>
 {% if pagename == "index" %}
 {% set download_url = 'https://github.com/fmtlib/fmt/releases/download' %}
-<div class="jumbotron">
-  <div class="tb-container">
-    <h1>{fmt}</h1>
-    <p class="lead">A modern formatting library</p>
-    <div class="btn-group" role="group">
-      {% set name = 'fmt' if version.split('.')[0]|int >= 3 else 'cppformat' %}
-      <a class="btn btn-success"
-         href="{{download_url}}/{{version}}/{{name}}-{{version}}.zip">
-           <span class="glyphicon glyphicon-download"></span> Download
-      </a>
-      <button type="button" class="btn btn-success dropdown-toggle"
-        data-toggle="dropdown"><span class="caret"></span></button>
-      <ul class="dropdown-menu">
+<div class="container-fluid fmt-banner p-5">
+  <h1>{fmt}</h1>
+  <p class="lead">A modern formatting library</p>
+  <div class="btn-group">
+    {% set name = 'fmt' if version.split('.')[0]|int >= 3 else 'cppformat' %}
+    <a class="btn btn-success"
+        href="{{download_url}}/{{version}}/{{name}}-{{version}}.zip">
+          <span class="glyphicon glyphicon-download"></span> Download
+    </a>
+    <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+      <span class="visually-hidden">Toggle Dropdown</span>
+    </button>
+    <ul class="dropdown-menu">
       {% for v in versions.split(',') %}
       {% set name = 'fmt' if v.split('.')[0]|int >= 3 else 'cppformat' %}
-        <li><a href="{{download_url}}/{{v}}/{{name}}-{{v}}.zip">Version {{v}}
-          </a></li>
+        <li><a class="dropdown-item" href="{{download_url}}/{{v}}/{{name}}-{{v}}.zip">Version {{v}}</a></li>
       {% endfor %}
-      </ul>
-    </div>
+    </ul>
   </div>
 </div>
 {% endif %}
@@ -112,7 +105,7 @@ <h1>{fmt}</h1>
 {% endblock %}
 
 {% block content %}
-<div class="tb-container">
+<div class="container">
   <div class="row">
     {# Sidebar is currently disabled.
     <div class="bs-sidebar">
@@ -144,5 +137,6 @@ <h1>{fmt}</h1>
 {% block footer %}
 {{ super() }}
 {# Placed at the end of the document so the pages load faster. #}
-<script src="_static/bootstrap.min.js"></script>
-{% endblock %}
+    <script src="_static/popper.min.js"></script>
+    <script src="_static/bootstrap.min.js"></script>
+{%- endblock %}
diff --git a/doc/basic-bootstrap/layout.html b/doc/basic-bootstrap/layout.html
@@ -8,7 +8,7 @@
     :license: BSD, see LICENSE for details.
 #}
 {%- block doctype -%}
-<!DOCTYPE html>
+<!doctype html>
 {%- endblock %}
 {%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
 {%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
@@ -99,28 +99,21 @@ <h3>{{ _('Navigation') }}</h3>
     {%- for scriptfile in script_files %}
     {{ js_tag(scriptfile) }}
     {%- endfor %}
-{%- endmacro %}
-
-{%- macro css() %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-    {%- for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-    {%- endfor %}
-{%- endmacro %}
+{%- endmacro -%}
 
 <html lang="en">
   <head>
-    <meta charset="{{ encoding }}">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    {# The above 3 meta tags *must* come first in the head; any other head content
-       must come *after* these tags. #}
+    {# The above meta tags *must* come first in the head; any other head content
+       must come *after* these tags. -#}
     {{ metatags }}
     {%- block htmltitle %}
     <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
     {%- endblock %}
-    {{ css() }}
+    {% for cssfile in css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" />
+    {%- endfor %}
     {%- if not embedded %}
     {{ script() }}
     {%- if use_opensearch %}
@@ -132,7 +125,7 @@ <h3>{{ _('Navigation') }}</h3>
     <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
     {%- endif %}
     {%- endif %}
-{%- block linktags %}
+{% block linktags %}
     {%- if hasdoc('about') %}
     <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
     {%- endif %}
@@ -154,7 +147,7 @@ <h3>{{ _('Navigation') }}</h3>
     {%- if prev %}
     <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
     {%- endif %}
-{%- endblock %}
+{% endblock %}
 {%- block extrahead %} {% endblock %}
   </head>
   <body role="document">

diff --git a/doc/bootstrap/alerts.less b/doc/bootstrap/alerts.less