aboutsummaryrefslogtreecommitdiff
path: root/src/libmain
diff options
context:
space:
mode:
authorGuillaume Maudoux <layus.on@gmail.com>2016-11-25 15:48:27 +0100
committerDomen Kožar <domen@dev.si>2016-11-25 15:48:27 +0100
commitf78126bfd6b6c8477fcdbc09b2f98772dbe9a1e7 (patch)
tree23a76a33f21ce39184bcbdcd28cb937d15968ce7 /src/libmain
parent7ee43df8622cc0589d54248fb44cebe1c1d991d2 (diff)
Get rid of unicode quotes (#1140)
Diffstat (limited to 'src/libmain')
-rw-r--r--src/libmain/shared.cc16
-rw-r--r--src/libmain/shared.hh6
2 files changed, 11 insertions, 11 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 0c6e3fb76..18d773475 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -37,7 +37,7 @@ void printGCWarning()
if (!gcWarning) return;
static bool haveWarned = false;
warnOnce(haveWarned,
- "you did not specify ‘--add-root’; "
+ "you did not specify '--add-root'; "
"the result might be removed by the garbage collector");
}
@@ -84,7 +84,7 @@ string getArg(const string & opt,
Strings::iterator & i, const Strings::iterator & end)
{
++i;
- if (i == end) throw UsageError(format("‘%1%’ requires an argument") % opt);
+ if (i == end) throw UsageError(format("'%1%' requires an argument") % opt);
return *i;
}
@@ -204,7 +204,7 @@ struct LegacyArgs : public MixCommonArgs
mkFlag(0, "show-trace", "show Nix expression stack trace in evaluation errors",
&settings.showTrace);
- mkFlag(0, "no-gc-warning", "disable warning about not using ‘--add-root’",
+ mkFlag(0, "no-gc-warning", "disable warning about not using '--add-root'",
&gcWarning, false);
}
@@ -223,7 +223,7 @@ struct LegacyArgs : public MixCommonArgs
Strings ss(args);
auto pos = ss.begin();
if (!parseArg(pos, ss.end()))
- throw UsageError(format("unexpected argument ‘%1%’") % args.front());
+ throw UsageError(format("unexpected argument '%1%'") % args.front());
return true;
}
};
@@ -261,7 +261,7 @@ void showManPage(const string & name)
{
restoreSIGPIPE();
execlp("man", "man", name.c_str(), NULL);
- throw SysError(format("command ‘man %1%’ failed") % name.c_str());
+ throw SysError(format("command 'man %1%' failed") % name.c_str());
}
@@ -283,13 +283,13 @@ int handleExceptions(const string & programName, std::function<void()> fun)
return e.status;
} catch (UsageError & e) {
printError(
- format(error + "%1%\nTry ‘%2% --help’ for more information.")
+ format(error + "%1%\nTry '%2% --help' for more information.")
% e.what() % programName);
return 1;
} catch (BaseError & e) {
printError(format(error + "%1%%2%") % (settings.showTrace ? e.prefix() : "") % e.msg());
if (e.prefix() != "" && !settings.showTrace)
- printError("(use ‘--show-trace’ to show detailed location information)");
+ printError("(use '--show-trace' to show detailed location information)");
return e.status;
} catch (std::bad_alloc & e) {
printError(error + "out of memory");
@@ -333,7 +333,7 @@ RunPager::RunPager()
execlp("pager", "pager", NULL);
execlp("less", "less", NULL);
execlp("more", "more", NULL);
- throw SysError(format("executing ‘%1%’") % pager);
+ throw SysError(format("executing '%1%'") % pager);
});
if (dup2(toPager.writeSide.get(), STDOUT_FILENO) == -1)
diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh
index 6d94a22f7..a147f9b4d 100644
--- a/src/libmain/shared.hh
+++ b/src/libmain/shared.hh
@@ -45,7 +45,7 @@ template<class N> N getIntArg(const string & opt,
Strings::iterator & i, const Strings::iterator & end, bool allowUnit)
{
++i;
- if (i == end) throw UsageError(format("‘%1%’ requires an argument") % opt);
+ if (i == end) throw UsageError(format("'%1%' requires an argument") % opt);
string s = *i;
N multiplier = 1;
if (allowUnit && !s.empty()) {
@@ -55,13 +55,13 @@ template<class N> N getIntArg(const string & opt,
else if (u == 'M') multiplier = 1ULL << 20;
else if (u == 'G') multiplier = 1ULL << 30;
else if (u == 'T') multiplier = 1ULL << 40;
- else throw UsageError(format("invalid unit specifier ‘%1%’") % u);
+ else throw UsageError(format("invalid unit specifier '%1%'") % u);
s.resize(s.size() - 1);
}
}
N n;
if (!string2Int(s, n))
- throw UsageError(format("‘%1%’ requires an integer argument") % opt);
+ throw UsageError(format("'%1%' requires an integer argument") % opt);
return n * multiplier;
}