From e3bd8ce699d9c9904687ffaefc6ca1fe105d9788 Mon Sep 17 00:00:00 2001
From: stratact <stratact1@gmail.com>
Date: Thu, 31 May 2018 10:33:43 -0700
Subject: [PATCH] Change `Variables::get_vars` to `Variables::strings` to
signify it's a iterator of strings rather than getting a Vec of them
---
src/lib/shell/binary/readln.rs | 2 +-
src/lib/shell/variables/mod.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/shell/binary/readln.rs b/src/lib/shell/binary/readln.rs
index c5d4881f..e46e7018 100644
--- a/src/lib/shell/binary/readln.rs
+++ b/src/lib/shell/binary/readln.rs
@@ -74,7 +74,7 @@ pub(crate) fn readln(shell: &mut Shell) -> Option<String> {
// Add the list of available variables to the completer's definitions.
// TODO: We should make it free to do String->SmallString
// and mostly free to go back (free if allocated)
- .chain(vars.get_vars().map(|s| ["$", &s].concat().into()))
+ .chain(vars.strings().map(|s| ["$", &s].concat().into()))
.collect();
// Initialize a new completer from the definitions collected.
diff --git a/src/lib/shell/variables/mod.rs b/src/lib/shell/variables/mod.rs
index 2f0e27d4..4133a316 100644
--- a/src/lib/shell/variables/mod.rs
+++ b/src/lib/shell/variables/mod.rs
@@ -182,7 +182,7 @@ impl Variables {
c.is_alphanumeric() || c == '_' || c == '?'
}
- pub fn get_vars<'a>(&'a self) -> impl Iterator<Item = Identifier> + 'a {
+ pub fn strings<'a>(&'a self) -> impl Iterator<Item = Identifier> + 'a {
self.variables
.keys()
.cloned()
--
GitLab