mirror of
https://github.com/lune-org/lune.git
synced 2025-04-03 01:50:55 +01:00
Merge branch 'lune-org:main' into ffi
This commit is contained in:
Qwreey
commit
410489a280
GPG key ID:
B5690EEEBB952194
9 changed files with 253 additions and 64 deletions
4
.github/workflows/ci.yaml
vendored
4
.github/workflows/ci.yaml
vendored
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
components: rustfmt
|
||||
|
||||
- name: Install Tooling
|
||||
uses: CompeyDev/setup-rokit@v0.1.0
|
||||
uses: CompeyDev/setup-rokit@v0.1.2
|
||||
|
||||
- name: Check Formatting
|
||||
run: just fmt-check
|
||||
|
|
@ -38,7 +38,7 @@ jobs:
|
|||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install Tooling
|
||||
uses: CompeyDev/setup-rokit@v0.1.0
|
||||
uses: CompeyDev/setup-rokit@v0.1.2
|
||||
|
||||
- name: Analyze
|
||||
run: just analyze
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ end)
|
|||
|
||||
for _ = 1, 5 do
|
||||
local start = os.clock()
|
||||
socket.send(tostring(1))
|
||||
local response = socket.next()
|
||||
socket:send(tostring(1))
|
||||
local response = socket:next()
|
||||
local elapsed = os.clock() - start
|
||||
print(`Got response '{response}' in {elapsed * 1_000} milliseconds`)
|
||||
task.wait(1 - elapsed)
|
||||
|
|
@ -38,7 +38,7 @@ end
|
|||
-- Everything went well, and we are done with the socket, so we can close it
|
||||
|
||||
print("Closing web socket...")
|
||||
socket.close()
|
||||
socket:close()
|
||||
|
||||
task.cancel(forceExit)
|
||||
print("Done! 🌙")
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ local handle = net.serve(PORT, {
|
|||
handleWebSocket = function(socket)
|
||||
print("Got new web socket connection!")
|
||||
repeat
|
||||
local message = socket.next()
|
||||
local message = socket:next()
|
||||
if message ~= nil then
|
||||
socket.send("Echo - " .. message)
|
||||
socket:send("Echo - " .. message)
|
||||
end
|
||||
until message == nil
|
||||
print("Web socket disconnected.")
|
||||
|
|
|
|||
40
CHANGELOG.md
40
CHANGELOG.md
|
|
@ -8,6 +8,46 @@ All notable changes to this project will be documented in this file.
|
|||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## `0.9.0`
|
||||
|
||||
### Breaking changes
|
||||
|
||||
- Added two new process spawning functions - `process.create` and `process.exec`, removing the previous `process.spawn` API completely. ([#211])
|
||||
|
||||
To migrate from `process.spawn`, use the new `process.exec` API which retains the same behavior as the old function.
|
||||
|
||||
The new `process.create` function is a non-blocking process creation API and can be used to interactively
|
||||
read and write stdio of the process.
|
||||
|
||||
```lua
|
||||
local child = process.create("program", {
|
||||
"cli-argument",
|
||||
"other-cli-argument"
|
||||
})
|
||||
|
||||
-- Writing to stdin
|
||||
child.stdin:write("Hello from Lune!")
|
||||
|
||||
-- Reading from stdout
|
||||
local data = child.stdout:read()
|
||||
print(buffer.tostring(data))
|
||||
```
|
||||
|
||||
- WebSocket methods in `net.socket` and `net.serve` now use standard Lua method calling convention and colon syntax.
|
||||
This means `socket.send(...)` is now `socket:send(...)`, `socket.close(...)` is now `socket:close(...)`, and so on.
|
||||
|
||||
- `Runtime::run` now returns a more useful value instead of an `ExitCode` ([#178])
|
||||
|
||||
### Changed
|
||||
|
||||
- Documentation comments for several standard library properties have been improved ([#248], [#250])
|
||||
- Error messages no longer contain redundant or duplicate stack trace information
|
||||
|
||||
[#178]: https://github.com/lune-org/lune/pull/178
|
||||
[#211]: https://github.com/lune-org/lune/pull/211
|
||||
[#248]: https://github.com/lune-org/lune/pull/248
|
||||
[#250]: https://github.com/lune-org/lune/pull/250
|
||||
|
||||
## `0.8.9` - October 7th, 2024
|
||||
|
||||
### Changed
|
||||
|
|
|
|||
94
Cargo.lock
generated
94
Cargo.lock
generated
|
|
@ -163,9 +163,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "async-compression"
|
||||
version = "0.4.13"
|
||||
version = "0.4.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429"
|
||||
checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e"
|
||||
dependencies = [
|
||||
"brotli",
|
||||
"flate2",
|
||||
|
|
@ -424,9 +424,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.28"
|
||||
version = "1.1.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
|
||||
checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
|
||||
dependencies = [
|
||||
"jobserver",
|
||||
"libc",
|
||||
|
|
@ -486,9 +486,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.19"
|
||||
version = "4.5.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
|
||||
checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
|
|
@ -496,9 +496,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.19"
|
||||
version = "4.5.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
|
||||
checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
|
|
@ -1229,9 +1229,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
|
|||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "0.14.30"
|
||||
version = "0.14.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
|
||||
checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"futures-channel",
|
||||
|
|
@ -1253,9 +1253,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "1.4.1"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
|
||||
checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"futures-channel",
|
||||
|
|
@ -1280,7 +1280,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
|
|||
dependencies = [
|
||||
"futures-util",
|
||||
"http 0.2.12",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"rustls 0.21.12",
|
||||
"tokio",
|
||||
"tokio-rustls 0.24.1",
|
||||
|
|
@ -1293,7 +1293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "7a343d17fe7885302ed7252767dc7bb83609a874b6ff581142241ec4b73957ad"
|
||||
dependencies = [
|
||||
"http-body-util",
|
||||
"hyper 1.4.1",
|
||||
"hyper 1.5.0",
|
||||
"hyper-util",
|
||||
"pin-project-lite",
|
||||
"tokio",
|
||||
|
|
@ -1312,7 +1312,7 @@ dependencies = [
|
|||
"futures-util",
|
||||
"http 1.1.0",
|
||||
"http-body 1.0.1",
|
||||
"hyper 1.4.1",
|
||||
"hyper 1.5.0",
|
||||
"pin-project-lite",
|
||||
"socket2",
|
||||
"tokio",
|
||||
|
|
@ -1421,9 +1421,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.70"
|
||||
version = "0.3.72"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
|
||||
checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
|
||||
dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
|
@ -1445,9 +1445,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.159"
|
||||
version = "0.2.160"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
|
||||
checksum = "f0b21006cd1874ae9e650973c565615676dc4a274c965bb0a73796dac838ce4f"
|
||||
|
||||
[[package]]
|
||||
name = "libffi"
|
||||
|
|
@ -1667,7 +1667,7 @@ dependencies = [
|
|||
"futures-util",
|
||||
"http 1.1.0",
|
||||
"http-body-util",
|
||||
"hyper 1.4.1",
|
||||
"hyper 1.5.0",
|
||||
"hyper-tungstenite",
|
||||
"hyper-util",
|
||||
"lune-std-serde",
|
||||
|
|
@ -2125,9 +2125,9 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
|
|||
|
||||
[[package]]
|
||||
name = "pathdiff"
|
||||
version = "0.2.1"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
|
||||
checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
|
||||
|
||||
[[package]]
|
||||
name = "pbkdf2"
|
||||
|
|
@ -2254,27 +2254,27 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.87"
|
||||
version = "1.0.88"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
|
||||
checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "profiling"
|
||||
version = "1.0.15"
|
||||
version = "1.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
|
||||
checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
|
||||
dependencies = [
|
||||
"profiling-procmacros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "profiling-procmacros"
|
||||
version = "1.0.15"
|
||||
version = "1.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
|
||||
checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 2.0.79",
|
||||
|
|
@ -2525,7 +2525,7 @@ dependencies = [
|
|||
"h2 0.3.26",
|
||||
"http 0.2.12",
|
||||
"http-body 0.4.6",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"hyper-rustls",
|
||||
"ipnet",
|
||||
"js-sys",
|
||||
|
|
@ -2687,9 +2687,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustls-pki-types"
|
||||
version = "1.9.0"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
|
||||
checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
|
||||
|
||||
[[package]]
|
||||
name = "rustls-webpki"
|
||||
|
|
@ -2714,9 +2714,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.17"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
|
||||
checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
|
||||
|
||||
[[package]]
|
||||
name = "rustyline"
|
||||
|
|
@ -3611,9 +3611,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.93"
|
||||
version = "0.2.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
|
||||
checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
|
|
@ -3622,9 +3622,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.93"
|
||||
version = "0.2.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
|
||||
checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
|
|
@ -3637,9 +3637,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-futures"
|
||||
version = "0.4.43"
|
||||
version = "0.4.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
|
||||
checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
|
|
@ -3649,9 +3649,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.93"
|
||||
version = "0.2.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
|
||||
checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
|
|
@ -3659,9 +3659,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.93"
|
||||
version = "0.2.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
|
||||
checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -3672,15 +3672,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.93"
|
||||
version = "0.2.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
|
||||
checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
|
||||
|
||||
[[package]]
|
||||
name = "web-sys"
|
||||
version = "0.3.70"
|
||||
version = "0.3.72"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
|
||||
checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
|
||||
dependencies = [
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
|
|
|
|||
|
|
@ -26,6 +26,11 @@ static STYLED_STACK_END: Lazy<String> = Lazy::new(|| {
|
|||
)
|
||||
});
|
||||
|
||||
// NOTE: We indent using 4 spaces instead of tabs since
|
||||
// these errors are most likely to be displayed in a terminal
|
||||
// or some kind of live output - and tabs don't work well there
|
||||
const STACK_TRACE_INDENT: &str = " ";
|
||||
|
||||
/**
|
||||
Error components parsed from a [`LuaError`].
|
||||
|
||||
|
|
@ -86,7 +91,7 @@ impl fmt::Display for ErrorComponents {
|
|||
let trace = self.trace.as_ref().unwrap();
|
||||
writeln!(f, "{}", *STYLED_STACK_BEGIN)?;
|
||||
for line in trace.lines() {
|
||||
writeln!(f, "\t{line}")?;
|
||||
writeln!(f, "{STACK_TRACE_INDENT}{line}")?;
|
||||
}
|
||||
writeln!(f, "{}", *STYLED_STACK_END)?;
|
||||
}
|
||||
|
|
@ -124,7 +129,7 @@ impl From<LuaError> for ErrorComponents {
|
|||
}
|
||||
|
||||
// We will then try to extract any stack trace
|
||||
let trace = if let LuaError::CallbackError {
|
||||
let mut trace = if let LuaError::CallbackError {
|
||||
ref traceback,
|
||||
ref cause,
|
||||
} = *error
|
||||
|
|
@ -147,6 +152,45 @@ impl From<LuaError> for ErrorComponents {
|
|||
None
|
||||
};
|
||||
|
||||
// Sometimes, we can get duplicate stack trace lines that only
|
||||
// mention "[C]", without a function name or path, and these can
|
||||
// be safely ignored / removed if the following line has more info
|
||||
if let Some(trace) = &mut trace {
|
||||
let lines = trace.lines_mut();
|
||||
loop {
|
||||
let first_is_c_and_empty = lines
|
||||
.first()
|
||||
.is_some_and(|line| line.source().is_c() && line.is_empty());
|
||||
let second_is_c_and_nonempty = lines
|
||||
.get(1)
|
||||
.is_some_and(|line| line.source().is_c() && !line.is_empty());
|
||||
if first_is_c_and_empty && second_is_c_and_nonempty {
|
||||
lines.remove(0);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Finally, we do some light postprocessing to remove duplicate
|
||||
// information, such as the location prefix in the error message
|
||||
if let Some(message) = messages.last_mut() {
|
||||
if let Some(line) = trace
|
||||
.iter()
|
||||
.flat_map(StackTrace::lines)
|
||||
.find(|line| line.source().is_lua())
|
||||
{
|
||||
let location_prefix = format!(
|
||||
"[string \"{}\"]:{}:",
|
||||
line.path().unwrap(),
|
||||
line.line_number().unwrap()
|
||||
);
|
||||
if message.starts_with(&location_prefix) {
|
||||
*message = message[location_prefix.len()..].trim().to_string();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ErrorComponents { messages, trace }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,24 @@ pub enum StackTraceSource {
|
|||
Lua,
|
||||
}
|
||||
|
||||
impl StackTraceSource {
|
||||
/**
|
||||
Returns `true` if the error originated from a C / Rust function, `false` otherwise.
|
||||
*/
|
||||
#[must_use]
|
||||
pub const fn is_c(self) -> bool {
|
||||
matches!(self, Self::C)
|
||||
}
|
||||
|
||||
/**
|
||||
Returns `true` if the error originated from a Lua (user) function, `false` otherwise.
|
||||
*/
|
||||
#[must_use]
|
||||
pub const fn is_lua(self) -> bool {
|
||||
matches!(self, Self::Lua)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Stack trace line parsed from a [`LuaError`].
|
||||
*/
|
||||
|
|
@ -82,6 +100,20 @@ impl StackTraceLine {
|
|||
pub fn function_name(&self) -> Option<&str> {
|
||||
self.function_name.as_deref()
|
||||
}
|
||||
|
||||
/**
|
||||
Returns `true` if the stack trace line contains no "useful" information, `false` otherwise.
|
||||
|
||||
Useful information is determined as one of:
|
||||
|
||||
- A path
|
||||
- A line number
|
||||
- A function name
|
||||
*/
|
||||
#[must_use]
|
||||
pub const fn is_empty(&self) -> bool {
|
||||
self.path.is_none() && self.line_number.is_none() && self.function_name.is_none()
|
||||
}
|
||||
}
|
||||
|
||||
impl FromStr for StackTraceLine {
|
||||
|
|
@ -145,6 +177,14 @@ impl StackTrace {
|
|||
pub fn lines(&self) -> &[StackTraceLine] {
|
||||
&self.lines
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the individual stack trace lines, mutably.
|
||||
*/
|
||||
#[must_use]
|
||||
pub fn lines_mut(&mut self) -> &mut Vec<StackTraceLine> {
|
||||
&mut self.lines
|
||||
}
|
||||
}
|
||||
|
||||
impl FromStr for StackTrace {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use mlua::prelude::*;
|
|||
|
||||
use crate::fmt::ErrorComponents;
|
||||
|
||||
fn new_lua_result() -> LuaResult<()> {
|
||||
fn new_lua_runtime_error() -> LuaResult<()> {
|
||||
let lua = Lua::new();
|
||||
|
||||
lua.globals()
|
||||
|
|
@ -17,13 +17,34 @@ fn new_lua_result() -> LuaResult<()> {
|
|||
lua.load("f()").set_name("chunk_name").eval()
|
||||
}
|
||||
|
||||
fn new_lua_script_error() -> LuaResult<()> {
|
||||
let lua = Lua::new();
|
||||
|
||||
lua.load(
|
||||
"local function inner()\
|
||||
\n error(\"oh no, a script error\")\
|
||||
\nend\
|
||||
\n\
|
||||
\nlocal function outer()\
|
||||
\n inner()\
|
||||
\nend\
|
||||
\n\
|
||||
\nouter()\
|
||||
",
|
||||
)
|
||||
.set_name("chunk_name")
|
||||
.eval()
|
||||
}
|
||||
|
||||
// Tests for error context stack
|
||||
mod context {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn preserves_original() {
|
||||
let lua_error = new_lua_result().context("additional context").unwrap_err();
|
||||
let lua_error = new_lua_runtime_error()
|
||||
.context("additional context")
|
||||
.unwrap_err();
|
||||
let components = ErrorComponents::from(lua_error);
|
||||
|
||||
assert_eq!(components.messages()[0], "additional context");
|
||||
|
|
@ -34,7 +55,7 @@ mod context {
|
|||
fn preserves_levels() {
|
||||
// NOTE: The behavior in mlua is to preserve a single level of context
|
||||
// and not all levels (context gets replaced on each call to `context`)
|
||||
let lua_error = new_lua_result()
|
||||
let lua_error = new_lua_runtime_error()
|
||||
.context("level 1")
|
||||
.context("level 2")
|
||||
.context("level 3")
|
||||
|
|
@ -54,7 +75,7 @@ mod error_components {
|
|||
|
||||
#[test]
|
||||
fn message() {
|
||||
let lua_error = new_lua_result().unwrap_err();
|
||||
let lua_error = new_lua_runtime_error().unwrap_err();
|
||||
let components = ErrorComponents::from(lua_error);
|
||||
|
||||
assert_eq!(components.messages()[0], "oh no, a runtime error");
|
||||
|
|
@ -62,7 +83,7 @@ mod error_components {
|
|||
|
||||
#[test]
|
||||
fn stack_begin_end() {
|
||||
let lua_error = new_lua_result().unwrap_err();
|
||||
let lua_error = new_lua_runtime_error().unwrap_err();
|
||||
let formatted = format!("{}", ErrorComponents::from(lua_error));
|
||||
|
||||
assert!(formatted.contains("Stack Begin"));
|
||||
|
|
@ -71,7 +92,7 @@ mod error_components {
|
|||
|
||||
#[test]
|
||||
fn stack_lines() {
|
||||
let lua_error = new_lua_result().unwrap_err();
|
||||
let lua_error = new_lua_runtime_error().unwrap_err();
|
||||
let components = ErrorComponents::from(lua_error);
|
||||
|
||||
let mut lines = components.trace().unwrap().lines().iter();
|
||||
|
|
@ -83,3 +104,47 @@ mod error_components {
|
|||
assert_eq!(line_2, "Script 'chunk_name', Line 1");
|
||||
}
|
||||
}
|
||||
|
||||
// Tests for general formatting
|
||||
mod general {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn message_does_not_contain_location() {
|
||||
let lua_error = new_lua_script_error().unwrap_err();
|
||||
|
||||
let components = ErrorComponents::from(lua_error);
|
||||
let trace = components.trace().unwrap();
|
||||
|
||||
let first_message = components.messages().first().unwrap();
|
||||
let first_lua_stack_line = trace
|
||||
.lines()
|
||||
.iter()
|
||||
.find(|line| line.source().is_lua())
|
||||
.unwrap();
|
||||
|
||||
let location_prefix = format!(
|
||||
"[string \"{}\"]:{}:",
|
||||
first_lua_stack_line.path().unwrap(),
|
||||
first_lua_stack_line.line_number().unwrap()
|
||||
);
|
||||
|
||||
assert!(!first_message.starts_with(&location_prefix));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn no_redundant_c_mentions() {
|
||||
let lua_error = new_lua_script_error().unwrap_err();
|
||||
|
||||
let components = ErrorComponents::from(lua_error);
|
||||
let trace = components.trace().unwrap();
|
||||
|
||||
let c_stack_lines = trace
|
||||
.lines()
|
||||
.iter()
|
||||
.filter(|line| line.source().is_c())
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(c_stack_lines.len(), 1); // Just the "error" call
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[tools]
|
||||
luau-lsp = "JohnnyMorganz/luau-lsp@1.32.1"
|
||||
luau-lsp = "JohnnyMorganz/luau-lsp@1.33.1"
|
||||
stylua = "JohnnyMorganz/StyLua@0.20.0"
|
||||
just = "casey/just@1.34.0"
|
||||
just = "casey/just@1.36.0"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue