summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiayi Zhao <jeff.no.zhao@gmail.com>2019-02-20 21:09:52 -0500
committerJiayi Zhao <jeff.no.zhao@gmail.com>2019-02-20 21:09:52 -0500
commit99af9db3b22f139b31a56b6a1f54612aacb73b6f (patch)
tree7be5c4db3ae6bcbfd5769444942ccf7e3c0c40ee
parent60b35381b3437c4eca80e4338e75d9f454dd150f (diff)
clean up some code
-rw-r--r--lib/wordexp-rs/src/lib.rs3
-rw-r--r--src/commands/mod.rs4
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/wordexp-rs/src/lib.rs b/lib/wordexp-rs/src/lib.rs
index 57dd9b7..1fe1be4 100644
--- a/lib/wordexp-rs/src/lib.rs
+++ b/lib/wordexp-rs/src/lib.rs
@@ -54,7 +54,8 @@ impl<'a> Wordexp<'a> {
impl<'a> std::iter::Iterator for Wordexp<'a> {
type Item = &'a str;
- fn next(&mut self) -> Option<&'a str> {
+ #[inline]
+ fn next(&mut self) -> Option<Self::Item> {
if self.counter >= self.we_wordv.len() {
self.counter = 0;
None
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index 09fbfb7..f6e0e7f 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -74,8 +74,8 @@ pub fn from_args(command: &str, args: Option<&Vec<String>>) -> Option<Box<Joshut
"cd" => {
if let Some(args) = args {
match wordexp::wordexp(args[0].as_str(), 0) {
- Ok(exp_strs) => {
- if let Some(exp_str) = exp_strs.into_iter().next() {
+ Ok(mut exp_strs) => {
+ if let Some(exp_str) = exp_strs.next() {
let path = PathBuf::from(exp_str);
return Some(Box::new(self::ChangeDirectory::new(path)));
}