h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-01 08:11:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

make style-all time again

Browse Source 
Recent changes have introduced some style deviations so clean them up.
This commit is contained in:
Kurtis Rader
2017-08-06 16:05:51 -07:00
parent acdb81bbca
commit 975a5bfbde
10 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/complete.cpp
View File

@@ -19,8 +19,8 @@
#include <set>
#include <string>
#include <type_traits>
#include <utility>
#include <unordered_set>
#include <utility>
#include "autoload.h"
#include "builtin.h"
@@ -248,9 +248,7 @@ static Iterator unique_unsorted(Iterator begin, Iterator end, HashFunction hash)
typedef typename std::iterator_traits<Iterator>::value_type T;
std::unordered_set<size_t> temp;
return std::remove_if(begin, end, [&](const T& val) {
return !temp.insert(hash(val)).second;
});
return std::remove_if(begin, end, [&](const T &val) { return !temp.insert(hash(val)).second; });
}
void completions_sort_and_prioritize(std::vector<completion_t> *comps) {
@@ -276,9 +274,10 @@ void completions_sort_and_prioritize(std::vector<completion_t> *comps) {
// Sort, provided COMPLETION_DONT_SORT isn't set
stable_sort(comps->begin(), comps->end(), completion_t::is_naturally_less_than);
// Deduplicate both sorted and unsorted results
comps->erase(unique_unsorted(comps->begin(), comps->end(), [](const completion_t &c) {
return std::hash<wcstring>{}(c.completion);
}), comps->end());
comps->erase(
unique_unsorted(comps->begin(), comps->end(),
[](const completion_t &c) { return std::hash<wcstring>{}(c.completion); }),
comps->end());
// Sort the remainder by match type. They're already sorted alphabetically.
stable_sort(comps->begin(), comps->end(), compare_completions_by_match_type);