Merge pull request #346 from qryxip/rust

kmyk · web-flow · commit 3f15271cd83b · 2020-12-30T12:50:22.000+09:00
Add Rust
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -45,6 +45,27 @@ jobs:
     - name: Install dependencies (Nim)
       run: sudo apt install nim
 
+    - name: Set up Rust (1.42.0)
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: 1.42.0-x86_64-unknown-linux-gnu
+        default: true
+        profile: minimal
+
+    # required by cargo-udeps
+    - name: Set up Rust (nightly)
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: nightly-x86_64-unknown-linux-gnu
+        default: true
+        profile: minimal
+
+    # required only if you set `languages.rust.list_dependencies_backend.kind` to `"cargo-udeps"`
+    - name: Install cargo-udeps for Rust
+      uses: actions-rs/install@v0.1
+      with:
+        crate: cargo-udeps
+        use-tool-cache: true
 
     - name: Run tests
       env:
diff --git a/.verify-helper/docs/static/document.ja.md b/.verify-helper/docs/static/document.ja.md
@@ -16,6 +16,7 @@
 | Ruby | `.rb` | `.test.rb` | `# verification-helper: [KEY] [VALUE]` | :heavy_check_mark: / :x: / :warning: | [hello_world.test.rb](https://github.com/online-judge-tools/verification-helper/blob/master/examples/ruby/hello_world.test.rb) |
 | Go | `.go` | `.test.go` | `// verification-helper: [KEY] [VALUE]` | :heavy_check_mark: / :x: / :warning: | [helloworld.test.go](https://github.com/online-judge-tools/verification-helper/blob/master/examples/go/helloworld.test.go) |
 | Java | `.java` | `_test.java` | `// verification-helper: [KEY] [VALUE]` | :heavy_check_mark: / :x: / :warning: | [HelloWorld_test.java](https://github.com/online-judge-tools/verification-helper/blob/master/examples/java/HelloWorld_test.java) |
+| Rust | `.rs` | 特殊 | `// verification-helper: [KEY] [VALUE]` | :heavy_check_mark: / :x: / :warning: | [itp1-1-a.rs](https://github.com/online-judge-tools/verification-helper/blob/master/examples/rust/verification/src/bin/aizu-online-judge-itp1-1-a.rs) |
 
 ### C++ の設定
 
@@ -59,6 +60,38 @@ NIMFLAGS = ["--warning:on", "--opt:none"]
 
 設定項目は特にありません。
 
+### Rust の設定
+
+[binary ターゲット](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#binaries)と [example ターゲット](https://doc.rust-lang.org/cargo/reference/cargo-targets.html#examples) (ただし`crate-type`が指定されているのは除く) の [root source file](https://docs.rs/cargo_metadata/0.12.0/cargo_metadata/struct.Target.html#structfield.src_path) のうち、[`PROBLEM`](#利用可能な属性)が設定されてあるソースファイルがテストファイルだと認識されます。
+
+依存ファイルを列挙する動作は `.verify-helper/config.toml` の `languages.rust.list_dependencies_backend` で変更できます。
+
+- `kind = "none"`
+
+    デフォルトの動作です。
+
+    ```toml
+    [languages.rust.list_dependencies_backend]
+    kind = "none"
+    ```
+
+    - あるターゲットの root source file であるならば、そのターゲット及びローカルにある依存クレートの、
+    - どのターゲットの root source file でもなければ、自身を含むターゲットの、
+
+    `.rs`ファイルすべてを列挙して返します。
+
+    ターゲットに関連する `.rs` ファイルはすべてひとまとまりとして扱われ、「モジュール間の依存関係」等については調べません。
+
+- `kind = "cargo-udeps"`
+
+    基本的に `kind = "none"` と同じですが、 `$PATH` 内にある [cargo-udeps](https://github.com/est31/cargo-udeps) を使い「パッケージからクレートへの依存」からさらに「クレート間の依存」を絞り込みます。
+
+    ```toml
+    [languages.rust.list_dependencies_backend]
+    kind = "cargo-udeps"
+    toolchain = "nightly-yyyy-mm-dd" # defaults to "nightly"
+    ```
+
 ### その他の言語の設定
 
 上記以外の言語でも実行可能です (例: [examples/awk/circle.test.awk](https://github.com/online-judge-tools/verification-helper/blob/master/examples/awk/circle.test.awk))。
diff --git a/examples/rust/.gitignore b/examples/rust/.gitignore
@@ -0,0 +1,2 @@
+/Cargo.lock
+/target/
diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml
@@ -0,0 +1,17 @@
+[workspace]
+members = ["verification/"]
+
+[package]
+name = "verification-helper-rust-example"
+version = "0.0.0"
+edition = "2018"
+publish = false
+
+[lib]
+name = "crate" # This crate itself is not intended to be used directly.
+
+[dependencies]
+verification-helper-rust-example-hello = { path = "crates/helloworld/hello" }
+verification-helper-rust-example-input = { path = "crates/io/input" }
+verification-helper-rust-example-scanner = { path = "crates/io/scanner" }
+verification-helper-rust-example-world = { path = "crates/helloworld/world" }
diff --git a/examples/rust/crates/helloworld/hello/Cargo.toml b/examples/rust/crates/helloworld/hello/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "verification-helper-rust-example-hello"
+version = "0.0.0"
+edition = "2018"
+publish = false
+
+[lib]
+name = "hello"
diff --git a/examples/rust/crates/helloworld/hello/src/lib.rs b/examples/rust/crates/helloworld/hello/src/lib.rs
@@ -0,0 +1,3 @@
+//! Provides `"Hello"`.
+
+pub static HELLO: &str = "Hello";
diff --git a/examples/rust/crates/helloworld/world/Cargo.toml b/examples/rust/crates/helloworld/world/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "verification-helper-rust-example-world"
+version = "0.0.0"
+edition = "2018"
+publish = false
+
+[lib]
+name = "world"
diff --git a/examples/rust/crates/helloworld/world/src/lib.rs b/examples/rust/crates/helloworld/world/src/lib.rs
@@ -0,0 +1,3 @@
+//! Provides `"World"`.
+
+pub static WORLD: &str = "World";
diff --git a/examples/rust/crates/io/input/Cargo.toml b/examples/rust/crates/io/input/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "verification-helper-rust-example-input"
+version = "0.1.0"
+authors = ["Ryo Yamashita <qryxip@gmail.com>"]
+edition = "2018"
+
+[lib]
+name = "input"
+
+[dependencies]
+verification-helper-rust-example-scanner = { path = "../scanner" }
diff --git a/examples/rust/crates/io/input/src/lib.rs b/examples/rust/crates/io/input/src/lib.rs
@@ -0,0 +1,23 @@
+//! A limited `input!` macro.
+//!
+//! ```no_run
+//! use input::input;
+//!
+//! input! {
+//!     a: u32,
+//!     b: u32,
+//! }
+//! ```
+
+pub use scanner::Scanner;
+
+/// A limited `input!` macro.
+#[macro_export]
+macro_rules! input {
+    ($($var:ident : $ty:ty),* $(,)?) => {
+        let mut __scanner = $crate::Scanner::from_stdin();
+        $(
+            let $var = __scanner.read::<$ty>();
+        )*
+    };
+}
diff --git a/examples/rust/crates/io/scanner/Cargo.toml b/examples/rust/crates/io/scanner/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "verification-helper-rust-example-scanner"
+version = "0.1.0"
+authors = ["Ryo Yamashita <qryxip@gmail.com>"]
+edition = "2018"
+
+[lib]
+name = "scanner"
diff --git a/examples/rust/crates/io/scanner/src/lib.rs b/examples/rust/crates/io/scanner/src/lib.rs
@@ -0,0 +1,58 @@
+//! A quite simple input scanner.
+//!
+//! ```no_run
+//! use scanner::Scanner;
+//!
+//! let mut sc = Scanner::from_stdin();
+//! let _: u64 = sc.read();
+//! ```
+
+use std::{
+    any, fmt,
+    io::{self, Read as _},
+    str::{FromStr, SplitAsciiWhitespace},
+};
+
+/// A quite simple input scanner.
+pub struct Scanner {
+    tokens: SplitAsciiWhitespace<'static>,
+}
+
+impl Scanner {
+    /// Constructs a new `Self` with while input from stdin.
+    ///
+    /// # Panics
+    ///
+    /// Panics if an IO error occurred.
+    pub fn from_stdin() -> Self {
+        let mut input = "".to_owned();
+        io::stdin().read_to_string(&mut input).unwrap();
+        Self {
+            tokens: Box::leak(input.into_boxed_str()).split_ascii_whitespace(),
+        }
+    }
+
+    /// Consumes and parses the next token.
+    ///
+    /// # Panics
+    ///
+    /// Panics if:
+    ///
+    /// - no token left
+    /// - failed to parse the token
+    pub fn read<T>(&mut self) -> T
+    where
+        T: FromStr,
+        T::Err: fmt::Display,
+    {
+        let token = self.tokens.next().expect("reached EOF");
+        token.parse().unwrap_or_else(|err| {
+            panic!(
+                "could not parse {:?} as `{}`: {}",
+                token,
+                any::type_name::<T>(),
+                err,
+            );
+        })
+    }
+}
diff --git a/examples/rust/rust-toolchain b/examples/rust/rust-toolchain
@@ -0,0 +1 @@
+1.42.0
diff --git a/examples/rust/src/lib.rs b/examples/rust/src/lib.rs
@@ -0,0 +1,19 @@
+//! Re-exports the crates for rustdoc.
+//!
+//! This crate itself is not intended to be used directly.
+
+// With `custom-build` and `syn` crate, we can expand crate-level rustdocs.
+
+macro_rules! re_export(($($name:ident),* $(,)?) => ($(pub mod $name { pub use ::$name::*; })*));
+
+pub mod helloworld {
+    //! Crates of "hello" and "world".
+
+    re_export!(hello, world);
+}
+
+pub mod io {
+    //! Crates about IO.
+
+    re_export!(input, scanner);
+}
diff --git a/examples/rust/verification/Cargo.toml b/examples/rust/verification/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "verification"
+version = "0.0.0"
+edition = "2018"
+publish = false
+
+[dependencies]
+verification-helper-rust-example-hello = { path = "../crates/helloworld/hello" }
+verification-helper-rust-example-input = { path = "../crates/io/input" }
+verification-helper-rust-example-world = { path = "../crates/helloworld/world" }
diff --git a/examples/rust/verification/src/bin/aizu-online-judge-itp1-1-a.rs b/examples/rust/verification/src/bin/aizu-online-judge-itp1-1-a.rs
@@ -0,0 +1,5 @@
+// verification-helper: PROBLEM http://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=ITP1_1_A
+
+fn main() {
+    println!("{} {}", hello::HELLO, world::WORLD);
+}
diff --git a/examples/rust/verification/src/bin/library-checker-aplusb.rs b/examples/rust/verification/src/bin/library-checker-aplusb.rs
@@ -0,0 +1,12 @@
+// verification-helper: PROBLEM https://judge.yosupo.jp/problem/aplusb
+
+use input::input;
+
+fn main() {
+    input! {
+        a: u32,
+        b: u32,
+    }
+
+    println!("{}", a + b);
+}
diff --git a/onlinejudge_verify/languages/list.py b/onlinejudge_verify/languages/list.py
@@ -12,6 +12,7 @@
 from onlinejudge_verify.languages.nim import NimLanguage
 from onlinejudge_verify.languages.python import PythonLanguage
 from onlinejudge_verify.languages.ruby import RubyLanguage
+from onlinejudge_verify.languages.rust import RustLanguage
 from onlinejudge_verify.languages.user_defined import UserDefinedLanguage
 
 logger = getLogger(__name__)
@@ -34,6 +35,7 @@ def _get_dict() -> Dict[str, Language]:
         _dict['.ruby'] = RubyLanguage()
         _dict['.go'] = GoLanguage()
         _dict['.java'] = JavaLanguage()
+        _dict['.rs'] = RustLanguage()
 
         for ext, config in get_config().get('languages', {}).items():
             if '.' + ext in _dict:
diff --git a/onlinejudge_verify/languages/rust.py b/onlinejudge_verify/languages/rust.py
diff --git a/tests/test_rust.py b/tests/test_rust.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+//! Provides `"Hello"`.
	`2`	`+`
	`3`	`+pub static HELLO: &str = "Hello";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+//! Provides `"World"`.
	`2`	`+`
	`3`	`+pub static WORLD: &str = "World";`