Compare commits
19 Commits
0759c64513
...
86b6150afd
| Author | SHA1 | Date | |
|---|---|---|---|
| 86b6150afd | |||
| 6ffa55510f | |||
| d4a410cb84 | |||
| b9f0e6c9f1 | |||
| 59b3ce7eab | |||
| ecc2058e13 | |||
| 722536bbb6 | |||
| 0c11eb718a | |||
| 1d4e022512 | |||
| b7c76b198b | |||
| cbfb3068e9 | |||
| 16ba661d2b | |||
|
1db36d168c
|
|||
|
8b700b0404
|
|||
|
e67e20ef29
|
|||
|
8fabd409ad
|
|||
|
031dd71cf3
|
|||
|
a8e2bfbb3c
|
|||
|
ba79fbe06d
|
@@ -3,12 +3,12 @@
|
|||||||
(rust-cargo-default-arguments . "-r")
|
(rust-cargo-default-arguments . "-r")
|
||||||
(eglot-workspace-configuration . (:rust-analyzer
|
(eglot-workspace-configuration . (:rust-analyzer
|
||||||
(:check
|
(:check
|
||||||
(:overrideCommand ["ninja" "clippy-json" "-C" "build"]))))
|
(:overrideCommand ["./rust-analyzer.sh"]))))
|
||||||
(eval . (add-to-list 'eglot-server-programs
|
(eval . (add-to-list 'eglot-server-programs
|
||||||
'((rust-ts-mode rust-mode) .
|
'((rust-ts-mode rust-mode) .
|
||||||
("rust-analyzer" :initializationOptions
|
("rust-analyzer" :initializationOptions
|
||||||
(:check
|
(:check
|
||||||
(:overrideCommand ["ninja" "clippy-json" "-C" "build"]))))))
|
(:overrideCommand ["./rust-analyzer.sh"]))))))
|
||||||
(eval . (eglot-ensure))
|
(eval . (eglot-ensure))
|
||||||
(eval . (company-mode 1))
|
(eval . (company-mode 1))
|
||||||
(eval . (add-hook 'before-save-hook 'fmt-current-buffer nil t))
|
(eval . (add-hook 'before-save-hook 'fmt-current-buffer nil t))
|
||||||
|
|||||||
@@ -2,4 +2,4 @@
|
|||||||
ninja rustfmt -C build
|
ninja rustfmt -C build
|
||||||
ninja rustdoc -C build
|
ninja rustdoc -C build
|
||||||
ninja clippy -C build
|
ninja clippy -C build
|
||||||
meson test -C build
|
ninja test -C build
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#![deny(unused_imports)]
|
||||||
#![allow(clippy::missing_safety_doc)]
|
#![allow(clippy::missing_safety_doc)]
|
||||||
|
|
||||||
use core::slice;
|
use core::slice;
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
gencorpus = executable(
|
gencorpus = executable(
|
||||||
'gencorpus',
|
'atom_parser_gencorpus',
|
||||||
'gencorpus.rs',
|
'gencorpus.rs',
|
||||||
dependencies: [mon],
|
dependencies: [mon],
|
||||||
link_with: [gentoo_utils],
|
link_with: [gentoo_utils],
|
||||||
)
|
)
|
||||||
|
|
||||||
corpus = custom_target(
|
corpus = custom_target(
|
||||||
'corpus',
|
'atom_parser_corpus',
|
||||||
output: 'corpus',
|
output: 'corpus',
|
||||||
command: [gencorpus, 'corpus'],
|
command: [gencorpus, 'corpus'],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
|
#![deny(unused_imports)]
|
||||||
|
|
||||||
use core::slice;
|
use core::slice;
|
||||||
use gentoo_utils::{
|
use gentoo_utils::{Parseable, atom::Version};
|
||||||
Parseable,
|
use mon::{Parser, input::InputIter};
|
||||||
atom::{Atom, Version},
|
|
||||||
};
|
|
||||||
use mon::{Parser, ParserFinishedError, input::InputIter};
|
|
||||||
use std::{
|
use std::{
|
||||||
cmp::Ordering,
|
cmp::Ordering,
|
||||||
io::{BufRead, BufReader, Write},
|
io::{BufRead, BufReader, Write},
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
gencorpus = executable(
|
gencorpus = executable(
|
||||||
'gencorpus',
|
'atom_vercmp_gencorpus',
|
||||||
'gencorpus.rs',
|
'gencorpus.rs',
|
||||||
dependencies: [mon],
|
dependencies: [mon],
|
||||||
link_with: [gentoo_utils],
|
link_with: [gentoo_utils],
|
||||||
)
|
)
|
||||||
|
|
||||||
corpus = custom_target(
|
corpus = custom_target(
|
||||||
'corpus',
|
'atom_vercmp_corpus',
|
||||||
output: 'corpus',
|
output: 'corpus',
|
||||||
command: [gencorpus, 'corpus'],
|
command: [gencorpus, 'corpus'],
|
||||||
)
|
)
|
||||||
|
|||||||
12
rust-analyzer.sh
Executable file
12
rust-analyzer.sh
Executable file
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# this script is a temporary workaround for not having a proper clippy-json target
|
||||||
|
|
||||||
|
source /etc/profile
|
||||||
|
|
||||||
|
cd build || exit $?
|
||||||
|
|
||||||
|
# compile as far as we can
|
||||||
|
ninja
|
||||||
|
|
||||||
|
ninja clippy-json
|
||||||
1
rust-project.json
Symbolic link
1
rust-project.json
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
build/rust-project.json
|
||||||
@@ -646,14 +646,6 @@ mod test {
|
|||||||
|
|
||||||
use crate::Parseable;
|
use crate::Parseable;
|
||||||
|
|
||||||
macro_rules! assert_eq_display {
|
|
||||||
($a:expr, $b:expr) => {
|
|
||||||
if $a != $b {
|
|
||||||
panic!("{} != {}", $a, $b);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
macro_rules! assert_cmp_display {
|
macro_rules! assert_cmp_display {
|
||||||
($a:expr, $b:expr, $ordering:expr) => {
|
($a:expr, $b:expr, $ordering:expr) => {
|
||||||
if $a.cmp(&$b) != $ordering {
|
if $a.cmp(&$b) != $ordering {
|
||||||
@@ -770,6 +762,7 @@ mod test {
|
|||||||
.parse_finished(InputIter::new("1.2.0a_alpha1_beta2-r1-8"))
|
.parse_finished(InputIter::new("1.2.0a_alpha1_beta2-r1-8"))
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
#[allow(clippy::single_element_loop)]
|
||||||
for (version_str, expected) in [("1.2.0", Ordering::Greater)] {
|
for (version_str, expected) in [("1.2.0", Ordering::Greater)] {
|
||||||
let version = Version::parser()
|
let version = Version::parser()
|
||||||
.parse_finished(InputIter::new(version_str))
|
.parse_finished(InputIter::new(version_str))
|
||||||
|
|||||||
Reference in New Issue
Block a user