Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Execution: Add stderr block #2397

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions theme/book.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,17 @@ function playground_text(playground, hidden = true) {
}

function run_rust_code(code_block) {
var result_block = code_block.querySelector(".result");
var result_stderr_block = code_block.querySelector(".result.stderr");
if (!result_stderr_block) {
result_stderr_block = document.createElement('code');
result_stderr_block.className = 'result stderr hljs nohighlight hidden';

code_block.append(result_stderr_block);
}
var result_block = code_block.querySelector(".result.stdout");
if (!result_block) {
result_block = document.createElement('code');
result_block.className = 'result hljs language-bash';
result_block.className = 'result stdout hljs nohighlight';

code_block.append(result_block);
}
Expand All @@ -127,21 +134,27 @@ function playground_text(playground, hidden = true) {
edition = "2021";
}
var params = {
version: "stable",
optimize: "0",
backtrace: true,
channel: "stable",
code: text,
edition: edition
edition: edition,
mode: "debug",
tests: false,
crateType: "bin",
};

if (text.indexOf("#![feature") !== -1) {
params.version = "nightly";
}

result_block.innerText = "Running...";
// hide stderr block while running
result_stderr_block.innerText = "";
result_stderr_block.classList.add("hidden");

const playgroundModified = isPlaygroundModified(code_block);
const startTime = window.performance.now();
fetch_with_timeout("https://play.rust-lang.org/evaluate.json", {
fetch_with_timeout("https://play.rust-lang.org/execute", {
headers: {
'Content-Type': "application/json",
},
Expand All @@ -158,13 +171,26 @@ function playground_text(playground, hidden = true) {
"latency": (endTime - startTime) / 1000,
});

if (response.result.trim() === '') {
if (response.stdout.trim() === '') {
result_block.innerText = "No output";
result_block.classList.add("result-no-output");
} else {
result_block.innerText = response.result;
result_block.innerText = response.stdout;
result_block.classList.remove("result-no-output");
}

// trim compile message
// ====================
// Compiling playground v0.0.1 (/playground)
// Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.60s
// Running `target/debug/playground`
// ====================
const compileMsgRegex = /^\s+Compiling(.+)\s+Finished(.+)\s+Running(.+)\n/;
response.stderr = response.stderr.replace(compileMsgRegex, "");
if (response.stderr.trim() !== '') {
result_stderr_block.classList.remove("hidden");
result_stderr_block.innerText = response.stderr;
}
})
.catch(error => {
const endTime = window.performance.now();
Expand Down