diff --git a/.ci/setup_lua.sh b/.ci/setup_lua.sh index 46c4d706..77bef0a6 100644 --- a/.ci/setup_lua.sh +++ b/.ci/setup_lua.sh @@ -88,7 +88,7 @@ lua -v LUAROCKS_BASE=luarocks-$LUAROCKS -# retry 5 times, connection to luarocks.org seems to timeout occassionally +# retry 5 times, connection to luarocks.org seems to timeout occasionally curl --silent --location --retry 5 "https://luarocks.org/releases/$LUAROCKS_BASE.tar.gz" | tar xz cd "$LUAROCKS_BASE" diff --git a/CMakeLists.txt b/CMakeLists.txt index aaaddce0..99f58c0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ endif (NOT WITH_LUA_ENGINE) if (NOT LUA_BUILD_TYPE) set(LUA_BUILD_TYPE "Static" - CACHE STRING "Build Lua/LuaJIT as static, dynamic libary, or use system one" FORCE) + CACHE STRING "Build Lua/LuaJIT as static, dynamic library, or use system one" FORCE) set_property(CACHE LUA_BUILD_TYPE PROPERTY STRINGS "Static;Dynamic;System") endif (NOT LUA_BUILD_TYPE) diff --git a/README.md b/README.md index 3e2828fa..2e6f4977 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ package is good for this. On OSX, you probably want XCode which comes with `clang` and `make` and friends. For windows the free Visual Studio Express works. If you get the 2013 edition, -make sure to get the `Windows Deskop` edition. The `Windows` version doesn't +make sure to get the `Windows Desktop` edition. The `Windows` version doesn't include a working C compiler. Make sure to run all of setup including getting a free license. diff --git a/docs.md b/docs.md index 40e01ba9..a6bb2c1e 100644 --- a/docs.md +++ b/docs.md @@ -210,7 +210,7 @@ lowercase option strings are listed below. In libuv, errors are represented by negative numbered constants. While these constants are made available in the `uv.errno` table, they are not returned by -luv funtions and the libuv functions used to handle them are not exposed. +luv functions and the libuv functions used to handle them are not exposed. Instead, if an internal error is encountered, the failing luv function will return to the caller an assertable `nil, err, name` tuple: @@ -3447,7 +3447,7 @@ looked up using the `getprotobyname(3)` function. Examples: `"ip"`, `"icmp"`, - `port`: `integer` or `nil` - `family`: `string` or `integer` or `nil` - `callback`: `callable` (async version) or `nil` (sync version) - - `err`: `nil` or `sring` + - `err`: `nil` or `string` - `host`: `string` or `nil` - `service`: `string` or `nil` diff --git a/src/luv.h b/src/luv.h index 1884fb74..6a759bff 100644 --- a/src/luv.h +++ b/src/luv.h @@ -90,10 +90,10 @@ typedef int (*luv_CFpcall) (lua_State* L, int nargs, int nresults, int flags); typedef int (*luv_CFcpcall) (lua_State* L, lua_CFunction func, void* ud, int flags); -/* Default implemention of event callback */ +/* Default implementation of event callback */ LUALIB_API int luv_cfpcall(lua_State* L, int nargs, int nresult, int flags); -/* Default implemention of thread entory function */ +/* Default implementation of thread entory function */ LUALIB_API int luv_cfcpcall(lua_State* L, lua_CFunction func, void* ud, int flags); typedef struct { diff --git a/src/process.c b/src/process.c index 6e429af8..3085b44a 100644 --- a/src/process.c +++ b/src/process.c @@ -146,7 +146,7 @@ static int luv_spawn(lua_State* L) { } for (i = 0; i < len; ++i) { lua_rawgeti(L, -1, i + 1); - // integers are assumed to be file descripters + // integers are assumed to be file descriptors if (lua_type(L, -1) == LUA_TNUMBER) { options.stdio[i].flags = UV_INHERIT_FD; options.stdio[i].data.fd = lua_tointeger(L, -1); diff --git a/tests/manual-test-exit.lua b/tests/manual-test-exit.lua index 90ef23cc..c1812b59 100644 --- a/tests/manual-test-exit.lua +++ b/tests/manual-test-exit.lua @@ -1,7 +1,7 @@ --come from https://github.com/luvit/luv/issues/599 -- run `lua manual-test-exit.lua || echo $?` --- it shoud print `5` +-- it should print `5` local uv = require('luv') diff --git a/tests/manual-test-external-loop.lua b/tests/manual-test-external-loop.lua index 053df199..39f62a3e 100644 --- a/tests/manual-test-external-loop.lua +++ b/tests/manual-test-external-loop.lua @@ -27,7 +27,7 @@ local thread = uv.new_thread(function(delay) local t2 = uv.thread_self() assert(t1:equal(t2)) assert(tostring(t1)==tostring(t2)) - _G.print('Runing', uv.thread_self()) + _G.print('Running', uv.thread_self()) assert(_THREAD) diff --git a/tests/test-dns.lua b/tests/test-dns.lua index 111b7b15..894220be 100644 --- a/tests/test-dns.lua +++ b/tests/test-dns.lua @@ -33,7 +33,7 @@ return require('lib/tap')(function (test) assert(res[1].port == 80) end, "1.3.0") - test("Get only ipv4 tcp adresses for luvit.io", function (print, p, expect, uv) + test("Get only ipv4 tcp addresses for luvit.io", function (print, p, expect, uv) assert(uv.getaddrinfo("luvit.io", nil, { socktype = "stream", family = "inet", @@ -50,7 +50,7 @@ return require('lib/tap')(function (test) -- FIXME: this test always fails on Windows/AppVeyor with ENOENT for some reason if not isWindows then - test("Get only ipv6 tcp adresses for luvit.io", function (print, p, expect, uv) + test("Get only ipv6 tcp addresses for luvit.io", function (print, p, expect, uv) assert(uv.getaddrinfo("luvit.io", nil, { socktype = "stream", family = "inet6", @@ -66,7 +66,7 @@ return require('lib/tap')(function (test) end) end - test("Get ipv4 and ipv6 tcp adresses for luvit.io", function (print, p, expect, uv) + test("Get ipv4 and ipv6 tcp addresses for luvit.io", function (print, p, expect, uv) assert(uv.getaddrinfo("luvit.io", nil, { socktype = "stream", }, expect(function (err, res) @@ -80,7 +80,7 @@ return require('lib/tap')(function (test) end))) end) - test("Get all adresses for luvit.io", function (print, p, expect, uv) + test("Get all addresses for luvit.io", function (print, p, expect, uv) assert(uv.getaddrinfo("luvit.io", nil, nil, expect(function (err, res) if errorAllowed(err) then print(err, "skipping") diff --git a/tests/test-thread.lua b/tests/test-thread.lua index a18566f5..a9c7ad8a 100644 --- a/tests/test-thread.lua +++ b/tests/test-thread.lua @@ -46,9 +46,9 @@ return require('lib/tap')(function (test) local delay = 100 uv.update_time() local before = uv.now() - print('Runing', uv.thread_self()) + print('Running', uv.thread_self()) uv.sleep(delay) - print('Runing', uv.thread_self()) + print('Running', uv.thread_self()) uv.update_time() local elapsed = uv.now() - before p({ diff --git a/tests/test-udp.lua b/tests/test-udp.lua index 1f170735..bd0f46d4 100644 --- a/tests/test-udp.lua +++ b/tests/test-udp.lua @@ -275,7 +275,7 @@ return require('lib/tap')(function (test) -- TODO This might be overkill, but the multicast -- tests seem to rely on external interfaces being -- available on some platforms. So, we use this to skip - -- the tests when there are no relevant exernal interfaces + -- the tests when there are no relevant external interfaces -- available. Note: The Libuv multicast join test does use this -- same check for skipping the ipv6 test; we just expanded it to -- the ipv4 test as well.