Compare commits
12 Commits
86b6150afd
...
0759c64513
| Author | SHA1 | Date | |
|---|---|---|---|
| 0759c64513 | |||
| e04e57e927 | |||
| 81aedc608d | |||
| 5cd318bc9f | |||
| 34662a99cd | |||
| d2ce6bc8ff | |||
| 91dcd3b3fb | |||
| e9386ad64a | |||
| c288787d91 | |||
| df10b0fac0 | |||
| 407b836c77 | |||
| 2c8a6c3783 |
@@ -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 ["./rust-analyzer.sh"]))))
|
(:overrideCommand ["ninja" "clippy-json" "-C" "build"]))))
|
||||||
(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 ["./rust-analyzer.sh"]))))))
|
(:overrideCommand ["ninja" "clippy-json" "-C" "build"]))))))
|
||||||
(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
|
||||||
ninja test -C build
|
meson test -C build
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
#![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(
|
||||||
'atom_parser_gencorpus',
|
'gencorpus',
|
||||||
'gencorpus.rs',
|
'gencorpus.rs',
|
||||||
dependencies: [mon],
|
dependencies: [mon],
|
||||||
link_with: [gentoo_utils],
|
link_with: [gentoo_utils],
|
||||||
)
|
)
|
||||||
|
|
||||||
corpus = custom_target(
|
corpus = custom_target(
|
||||||
'atom_parser_corpus',
|
'corpus',
|
||||||
output: 'corpus',
|
output: 'corpus',
|
||||||
command: [gencorpus, 'corpus'],
|
command: [gencorpus, 'corpus'],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
#![deny(unused_imports)]
|
|
||||||
|
|
||||||
use core::slice;
|
use core::slice;
|
||||||
use gentoo_utils::{Parseable, atom::Version};
|
use gentoo_utils::{
|
||||||
use mon::{Parser, input::InputIter};
|
Parseable,
|
||||||
|
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(
|
||||||
'atom_vercmp_gencorpus',
|
'gencorpus',
|
||||||
'gencorpus.rs',
|
'gencorpus.rs',
|
||||||
dependencies: [mon],
|
dependencies: [mon],
|
||||||
link_with: [gentoo_utils],
|
link_with: [gentoo_utils],
|
||||||
)
|
)
|
||||||
|
|
||||||
corpus = custom_target(
|
corpus = custom_target(
|
||||||
'atom_vercmp_corpus',
|
'corpus',
|
||||||
output: 'corpus',
|
output: 'corpus',
|
||||||
command: [gencorpus, 'corpus'],
|
command: [gencorpus, 'corpus'],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
#!/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 +0,0 @@
|
|||||||
build/rust-project.json
|
|
||||||
@@ -646,6 +646,14 @@ 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 {
|
||||||
@@ -762,7 +770,6 @@ 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