Merge branch 'master' into range-bounds

Author: TonalidadeHidrica

.github/workflows/ci.yml

@@ -18,25 +18,25 @@ jobs:
           - stable-x86_64-unknown-linux-gnu
 
     name: Rustfmt (${{ matrix.toolchain }})
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: 'Setup `${{ matrix.toolchain }}`'
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
-          override: true
-          profile: minimal
           components: rustfmt
 
+      - name: 'Override `${{ matrix.toolchain }}'
+        run: |
+          rustup override set ${{ matrix.toolchain }}
+
       - name: cargo-fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+        run: |
+          cargo fmt --all -- --check
 
   build:
     strategy:
@@ -51,11 +51,11 @@ jobs:
           - stable-x86_64-unknown-linux-gnu
         include:
           - { toolchain: 1.42.0-x86_64-pc-windows-msvc  , os: windows-2019 }
-          - { toolchain: 1.42.0-x86_64-apple-darwin     , os: macos-10.15  }
-          - { toolchain: 1.42.0-x86_64-unknown-linux-gnu, os: ubuntu-18.04 }
+          - { toolchain: 1.42.0-x86_64-apple-darwin     , os: macos-11     }
+          - { toolchain: 1.42.0-x86_64-unknown-linux-gnu, os: ubuntu-20.04 }
           - { toolchain: stable-x86_64-pc-windows-msvc  , os: windows-2019 }
-          - { toolchain: stable-x86_64-apple-darwin     , os: macos-10.15  }
-          - { toolchain: stable-x86_64-unknown-linux-gnu, os: ubuntu-18.04 }
+          - { toolchain: stable-x86_64-apple-darwin     , os: macos-11     }
+          - { toolchain: stable-x86_64-unknown-linux-gnu, os: ubuntu-20.04 }
 
     name: Build (${{ matrix.toolchain }})
     runs-on: ${{ matrix.os }}
@@ -66,33 +66,29 @@ jobs:
         if: matrix.os == 'windows-2019'
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: 'Setup `${{ matrix.toolchain }}`'
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
-          override: true
-          profile: minimal
           components: clippy
 
+      - name: 'Override `${{ matrix.toolchain }}`'
+        run: |
+          rustup override set ${{ matrix.toolchain }}
+
       - name: cargo-clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --workspace --all-targets -- -D warnings
+        run: |
+          cargo clippy --workspace --all-targets -- -A renamed-and-removed-lints -D warnings
 
       - name: cargo-build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --workspace --all-targets
+        run: |
+          cargo build --workspace --all-targets
 
       - name: cargo-test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --no-fail-fast
+        run: |
+          cargo test --workspace --no-fail-fast
         env:
           RUST_BACKTRACE: full
 
@@ -108,22 +104,24 @@ jobs:
           - '3.8' # https://packages.ubuntu.com/focal/python3
 
     name: Expand_test (${{ matrix.toolchain }}, ${{ matrix.python-version }})
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: 'Setup `${{ matrix.toolchain }}`'
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.toolchain }}
-          override: true
-          profile: minimal
           components: rustfmt
 
+      - name: 'Override `${{ matrix.toolchain }}`'
+        run: |
+          rustup override set ${{ matrix.toolchain }}
+
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -136,28 +134,28 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Setup `1.47.0-x86_64-unknown-linux-gnu`
-        uses: actions-rs/toolchain@v1
+      - name: Setup `1.60.0-x86_64-unknown-linux-gnu`
+        uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.47.0-x86_64-unknown-linux-gnu
-          override: true
-          profile: minimal
+          toolchain: 1.60.0-x86_64-unknown-linux-gnu
+
+      - name: 'Override `1.60.0-x86_64-unknown-linux-gnu'
+        run: |
+          rustup override set 1.60.0-x86_64-unknown-linux-gnu
 
       - name: Setup Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.9'
 
       - name: Install `oj`
         run: pip install online-judge-tools
 
       - name: cargo-build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release --examples
+        run: |
+          cargo build --release --examples
 
       - name: Verify
         run: |

Cargo.toml

@@ -15,7 +15,6 @@ publish = false
 [dependencies]
 
 [dev-dependencies]
-input = { path = "./crates/input" }
 proconio = "=0.3.6"
 proconio-derive = "0.2.1"
 rand = "0.7.3"

crates/input/Cargo.toml

@@ -1,6 +1,6 @@
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.css" integrity="sha384-AfEj0r4/OFrOo5t7NnNe46zW/tFgW6x/bCJG8FqQCEo3+Aro6EYUG4+cU+KJWu/X" crossorigin="anonymous">
-<script defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/katex.min.js" integrity="sha384-g7c+Jr9ZivxKLnZTDUhnkOnsh30B4H0rpLUpJ4jAIKs4fnJI+sEnkvrMWph2EDg4" crossorigin="anonymous"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/katex@0.12.0/dist/contrib/auto-render.min.js" integrity="sha384-mll67QQFJfxn0IYznZYonOWZ644AWYC+Pt2cHqMaRhXVrursRwvLnLaebdGIlYNa" crossorigin="anonymous"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.4/dist/katex.min.css" integrity="sha384-vKruj+a13U8yHIkAyGgK1J3ArTLzrFGBbBc0tDp4ad/EyewESeXE/Iv67Aj8gKZ0" crossorigin="anonymous">
+<script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.4/dist/katex.min.js" integrity="sha384-PwRUT/YqbnEjkZO0zZxNqcxACrXe+j766U2amXcgMg5457rve2Y7I6ZJSm2A0mS4" crossorigin="anonymous"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.4/dist/contrib/auto-render.min.js" integrity="sha384-+VBxd3r6XgURycqtZ117nYw44OOcIax56Z4dCRWbxyPt0Koah1uHoK0o4+/RRE05" crossorigin="anonymous"></script>
 <script>
   document.addEventListener("DOMContentLoaded", () => {
     renderMathInElement(document.body, {

crates/input/src/lib.rs

@@ -1,5 +1,5 @@
 #[macro_use]
-extern crate input as _;
+extern crate proconio as _;
 
 use ac_library_rs::{convolution, modint::ModInt998244353 as Mint};
 use std::fmt;

doc/katex-header.html

@@ -1,5 +1,5 @@
 #[macro_use]
-extern crate input as _;
+extern crate proconio as _;
 #[macro_use]
 extern crate proconio_derive as _;
 

examples/library-checker-convolution-mod.rs

@@ -1,5 +1,5 @@
 #[macro_use]
-extern crate input as _;
+extern crate proconio as _;
 #[macro_use]
 extern crate proconio_derive as _;
 

examples/library-checker-static-range-sum.rs

@@ -1,5 +1,5 @@
 #[macro_use]
-extern crate input as _;
+extern crate proconio as _;
 
 use ac_library_rs::dsu::Dsu;
 

examples/library-checker-sum-of-floor-of-linear.rs

@@ -26,9 +26,11 @@
 Options:
     -a  --all       import all modules
     -h  --help      print help
+    -o file
+    --output file   output file
 '''
 output_header = '//https://github.com/rust-lang-ja/ac-library-rs\n'
-opt_list = ['help', 'all']
+opt_list = ['help', 'all', 'output=']
 output_list_all = ('convolution', 'dsu', 'fenwicktree', 'lazysegtree', 'math',
                    'maxflow',  'mincostflow', 'modint', 'scc',  'segtree',
                    'string', 'twosat',
@@ -44,13 +46,14 @@
                    'segtree': ('internal_bit', 'internal_type_traits',),
                    'twosat': ('internal_scc',), }
 src_path = 'src/'
+output_path = None
 
 
 def output_file(filename):
     global src_path
 
     res = []
-    with open(src_path+filename+'.rs', 'r') as f:
+    with open(src_path+filename+'.rs', 'r', encoding='utf-8', newline='') as f:
         res.append('pub mod {} {{'.format(filename))
 
         for line in f:
@@ -61,7 +64,7 @@ def output_file(filename):
 
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], 'ah', opt_list)
+    opts, args = getopt.getopt(sys.argv[1:], 'aho:', opt_list)
 except getopt.GetoptError as e:
     print(e)
     print(usage)
@@ -77,6 +80,8 @@ def output_file(filename):
         sys.exit(0)
     elif o == '--all' or o == '-a':
         args = list(output_list_all)
+    elif o == '--output' or o == '-o':
+        output_path = v
 
 output_list = set()
 
@@ -108,11 +113,14 @@ def output_file(filename):
 # rustfmt
 with tempfile.TemporaryDirectory() as temp_dir:
     temp_file = temp_dir + '/output.rs'
-    with open(temp_file, 'w') as f:
+    with open(temp_file, 'w', encoding='utf-8', newline='') as f:
         print(output_header, file=f)
         for i in output_data:
             print(i, file=f)
     output_data = subprocess.run(["rustfmt", temp_file], check=True)
-    with open(temp_file, 'r') as f:
+    with open(temp_file, 'r', encoding='utf-8', newline='') as f:
+        wf = open(output_path, 'w', encoding='utf-8', newline='') if output_path is not None else sys.stdout
         for line in f:
-            print(line, end="")
+            print(line, end='', file=wf)
+        if output_path is not None:
+            wf.close()