Fix std.utf + stdx.logger for -dip1000

dlang · Mar 15, 2018 · 1cbd3db · 1cbd3db
1 parent d51fd2a
commit 1cbd3db
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/std/experimental/logger/core.d b/std/experimental/logger/core.d
@@ -648,10 +648,9 @@ private struct MsgRange
 
     void put(dchar elem) @safe
     {
-        import std.utf : encode;
-        char[4] buffer;
-        size_t len = encode(buffer, elem);
-        log.logMsgPart(buffer[0 .. len]);
+        import std.utf : toUTF8;
+        import std.range : only;
+        log.logMsgPart(elem.only.toUTF8);
     }
 }
 

diff --git a/std/utf.d b/std/utf.d
@@ -4091,6 +4091,7 @@ if (isSomeChar!C)
 
                 static if (isForwardRange!R)
                 {
+                    static if (hasIndirections!R)
                     @property auto save() return scope
                     /* `return scope` cannot be inferred because compiler does not
                      * track it backwards from assignment to local `ret`
@@ -4100,6 +4101,17 @@ if (isSomeChar!C)
                         ret.r = r.save;
                         return ret;
                     }
+
+                    static if (!hasIndirections!R)
+                    @property auto save() scope
+                    /* `return scope` cannot be inferred because compiler does not
+                     * track it backwards from assignment to local `ret`
+                     */
+                    {
+                        auto ret = this;
+                        ret.r = r.save;
+                        return ret;
+                    }
                 }
 
             private: