Skip to content

Commit

Permalink
Merge branch 'roc-lang:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
dadhi authored Nov 11, 2024
2 parents 5549eb4 + b7c2cb0 commit 0f044e0
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu_x86_64_nix_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:

# for skipped tests; see #6946, #6947
- name: cargo test without --release
run: nix develop -c sh -c 'export ROC_CHECK_MONO_IR=1 && cargo test -- --skip tests/exhaustive/match_on_result_with_uninhabited_error_destructuring_in_lambda_syntax.txt --skip tests::identity_lambda --skip tests::issue_2300 --skip tests::issue_2582_specialize_result_value --skip tests::sum_lambda'
run: nix develop -c sh -c 'export ROC_CHECK_MONO_IR=1 && cargo test'
8 changes: 8 additions & 0 deletions crates/compiler/uitest/src/uitest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ fn collect_uitest_files() -> io::Result<Vec<PathBuf>> {
}

if path.extension() == Some(OsStr::new("txt")) {
// see issue 6947
if cfg!(debug_assertions)
&& path.to_string_lossy().contains(
"match_on_result_with_uninhabited_error_destructuring_in_lambda_syntax",
)
{
continue;
}
tests.push(path);
}
}
Expand Down
11 changes: 8 additions & 3 deletions crates/repl_test/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -624,12 +624,15 @@ fn list_of_3_field_records() {
);
}

// not(debug_assertions) because of issue #6946
#[cfg(not(debug_assertions))]
#[test]
fn identity_lambda() {
expect_success("\\x -> x", "<function> : a -> a");
}

#[cfg(not(feature = "wasm"))]
// not(debug_assertions) because of issue #6946
#[cfg(all(not(feature = "wasm"), not(debug_assertions)))]
#[test]
fn sum_lambda() {
expect_success("\\x, y -> x + y", "<function> : Num a, Num a -> Num a");
Expand Down Expand Up @@ -1049,7 +1052,8 @@ fn large_nullable_wrapped_tag_union() {
)
}

#[cfg(not(feature = "wasm"))]
// not(debug_assertions) because of issue #6946
#[cfg(all(not(feature = "wasm"), not(debug_assertions)))]
#[test]
fn issue_2300() {
expect_success(
Expand Down Expand Up @@ -1330,7 +1334,8 @@ fn box_box_type_alias() {
}

#[test]
#[cfg(not(feature = "wasm"))]
// not(debug_assertions) because of issue #6946
#[cfg(all(not(feature = "wasm"), not(debug_assertions)))]
fn issue_2582_specialize_result_value() {
expect_success(
r#"\x, list -> if x > 0 then List.first list else Ok """#,
Expand Down
4 changes: 4 additions & 0 deletions www/content/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
<p>Roc doesn’t have a numbered release or an installer yet, but you can follow the install instructions for your OS<a href="/install/getting_started.html#installation"> here </a>. If you get stuck, friendly people will be happy to help if you open a topic in<a href="https://roc.zulipchat.com/#narrow/stream/231634-beginners"> #beginners </a>on<a href="https://roc.zulipchat.com/"> Roc Zulip Chat </a>and ask for assistance!</p>
</section>

## [LLM Docs](#llm-docs) {#llm-docs}

We have experimental LLM-friendly text files for our [tutorial](/llms.txt) and [standard library](/builtins/llms.txt) that you can use to prompt your favorite LLM to answer your questions about Roc!

## [REPL](#repl) {#repl}

Let's start by getting acquainted with Roc's [_Read-Eval-Print-Loop_](https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop), or **REPL** for short.
Expand Down
4 changes: 4 additions & 0 deletions www/main.roc
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ import pf.SSG
import pf.Types exposing [Args]
import pf.Html exposing [header, nav, div, link, attribute, text, a, span, html, head, body, meta, script, footer, br]
import pf.Html.Attributes exposing [id, ariaLabel, ariaHidden, title, href, class, rel, type, content, lang, charset, name, color]
import "content/tutorial.md" as tutorialMarkdown : Str

import InteractiveExample

main : Args -> Task {} _
main = \{ inputDir, outputDir } ->

SSG.writeFile! { outputDir, relpath: Types.toRelPath "llms.txt", content: tutorialMarkdown }

# get the path and url of markdown files in content directory
files = SSG.files! inputDir

Expand Down

0 comments on commit 0f044e0

Please sign in to comment.