Good now!

Next CI try

Hmm, no move here!?

And via move assign

Move more

Move again

Damn

Revert offender

Try this

Bdaba

Reveal CI

Try some more advanced

Move to 43

Another CI 2

Now this CI

Another CI check

Next ttry

And more

Revert if it works 1

More steps

Try again

Author: mgreter

src/ast_containers.hpp

@@ -55,6 +55,7 @@ namespace Sass {
     // Some simple method delegations
     void clear() { return elements_.clear(); }
     size_t size() const { return elements_.size(); }
+    void reserve(size_t n) { return elements_.reserve(n); }
     bool empty() const { return elements_.empty(); }
     const T& at(size_t i) const { return elements_.at(i); }
     const T& get(size_t i) const { return elements_[i]; }
@@ -210,6 +211,18 @@ namespace Sass {
       return false;
     }
 
+    // This might be better implemented as `operator=`?
+    void elementsN(const sass::vector<T>& e)
+    {
+      elements_ = e;
+    }
+
+    // This might be better implemented as `operator=`?
+    void elementsM(sass::vector<T>&& e)
+    {
+      elements_ = std::move(e);
+    }
+
     template <typename P>
     typename sass::vector<T>::iterator insert(P position, const T& val) {
       return elements_.insert(position, val);
@@ -370,14 +383,14 @@ namespace Sass {
       return elements_;
     }
 
-    sass::vector<K> keys() const {
+    const sass::vector<K> keys() const {
       sass::vector<T> list;
       for (auto kv : elements_) {
         list.emplace_back(kv.first);
       }
       return list;
     }
-    sass::vector<T> values() const {
+    const sass::vector<T> values() const {
       sass::vector<T> list;
       for (auto kv : elements_) {
         list.emplace_back(kv.second);

src/ast_selectors.cpp

@@ -587,7 +587,7 @@ namespace Sass {
   {
     ListObj list = SASS_MEMORY_NEW(List,
       pstate(), {}, SASS_COMMA);
-//    list->reserve(size());
+    list->reserve(size());
     for (ComplexSelector* complex : elements()) {
       list->append(complex->toList());
     }
@@ -662,7 +662,7 @@ namespace Sass {
           }
           // Reset the parent selector tail with
           // the combination of parent plus ourself
-          complex->elements43().back() = tail;
+          complex->set_last(tail);
           // Append to results
           rv.emplace_back(complex);
         }

src/extender.cpp

@@ -191,7 +191,8 @@ namespace Sass {
 
       SelectorListObj res = extendList(selector, extensions, mediaContext);
 
-      if (res) *selector = std::move(*res);
+      selector->elementsN(res->elements43());
+      // *selector = std::move(*res); // no move please
 
     }
 
@@ -400,7 +401,7 @@ namespace Sass {
       // If no extends actually happened (for example because unification
       // failed), we don't need to re-register the selector.
       if (ObjEqualityFn(oldValue, ext)) continue;
-      *rule = std::move(*ext);
+      rule->elementsM(std::move(ext->elements43()));
       registerSelector(rule, rule);
 
     }

src/remove_placeholders.cpp

@@ -38,9 +38,7 @@ namespace Sass {
           if (compound) remove_placeholders(compound);
         }
       }
-      // ToDO: upgrade to new method
-//      listEraseItemIf(complex->elements(), listIsEmpty<SelectorComponent>);
-
+      listEraseItemIf(complex->elements43(), listIsEmpty<SelectorComponent>);
       // ToDo: describe what this means
       if (complex->hasInvisible()) {
         complex->clear(); // remove all
@@ -52,18 +50,15 @@ namespace Sass {
       for(const ComplexSelectorObj& complex : sl->elements()) {
         if (complex) remove_placeholders(complex);
       }
-
-      // ToDO: upgrade to new method
-//      listEraseItemIf(sl->elements(), listIsEmpty<ComplexSelector>);
+      listEraseItemIf(sl->elements43(), listIsEmpty<ComplexSelector>);
     }
 
     void RemovePlaceholders::visitCssRoot(CssRoot* b)
     {
       // Clean up all our children
       acceptCssParentNode(b);
       // Remove all invisible items
-      // ToDO: upgrade to new method
-      // listEraseItemIf(b->elements(), isInvisibleCss); // QQQQQQQQQQQQHHHHHH
+      listEraseItemIf(b->elements43(), isInvisibleCss); // QQQQQQQQQQQQHHHHHH
     }
 
     void RemovePlaceholders::visitCssStyleRule(CssStyleRule* rule)