RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 03:57:44 +00:00
Code Issues Activity

Fix clippy warnings in test.rs

Browse source
This commit is contained in:
Sylvestre Ledru 2021-09-06 20:41:41 +02:00 • committed by GitHub
parent d8d71cc477
commit 90fd900b8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/uu/test/src/test.rs
View file

@ -11,10 +11,9 @@
mod parser; mod parser;
use clap::{crate_version, App, AppSettings}; use clap::{crate_version, App, AppSettings};
use parser::{parse, Op, Symbol, UnaryOp}; use parser::{parse, Operator, Symbol, UnaryOperator};
use std::ffi::{OsStr, OsString}; use std::ffi::{OsStr, OsString};
use std::path::Path; use std::path::Path;
use uucore::executable;
const USAGE: &str = "test EXPRESSION const USAGE: &str = "test EXPRESSION
or: test or: test
@ -87,7 +86,7 @@ the version described here. Please refer to your shell's documentation
for details about the options it supports."; for details about the options it supports.";
pub fn uu_app() -> App<'static, 'static> { pub fn uu_app() -> App<'static, 'static> {
App::new(executable!()) App::new(uucore::util_name())
.setting(AppSettings::DisableHelpFlags) .setting(AppSettings::DisableHelpFlags)
.setting(AppSettings::DisableVersion) .setting(AppSettings::DisableVersion)
} }
@ -160,19 +159,19 @@ fn eval(stack: &mut Vec<Symbol>) -> Result<bool, String> {
Ok(!result) Ok(!result)
} }
Some(Symbol::Op(Op::StringOp(op))) => { Some(Symbol::Op(Operator::String(op))) => {
let b = stack.pop(); let b = stack.pop();
let a = stack.pop(); let a = stack.pop();
Ok(if op == "!=" { a != b } else { a == b }) Ok(if op == "!=" { a != b } else { a == b })
} }
Some(Symbol::Op(Op::IntOp(op))) => { Some(Symbol::Op(Operator::Int(op))) => {
let b = pop_literal!(); let b = pop_literal!();
let a = pop_literal!(); let a = pop_literal!();
Ok(integers(&a, &b, &op)?) Ok(integers(&a, &b, &op)?)
} }
Some(Symbol::Op(Op::FileOp(_op))) => unimplemented!(), Some(Symbol::Op(Operator::File(_op))) => unimplemented!(),
Some(Symbol::UnaryOp(UnaryOp::StrlenOp(op))) => { Some(Symbol::UnaryOp(UnaryOperator::StrlenOp(op))) => {
let s = match stack.pop() { let s = match stack.pop() {
Some(Symbol::Literal(s)) => s, Some(Symbol::Literal(s)) => s,
Some(Symbol::None) => OsString::from(""), Some(Symbol::None) => OsString::from(""),
@ -190,7 +189,7 @@ fn eval(stack: &mut Vec<Symbol>) -> Result<bool, String> {
!s.is_empty() !s.is_empty()
}) })
} }
Some(Symbol::UnaryOp(UnaryOp::FiletestOp(op))) => { Some(Symbol::UnaryOp(UnaryOperator::FiletestOp(op))) => {
let op = op.to_string_lossy(); let op = op.to_string_lossy();
let f = pop_literal!(); let f = pop_literal!();