The rockin’ Roc REPL
@@ -33,8 +33,8 @@ The rockin’ Roc REPL
-
-
+
diff --git a/crates/reporting/src/error/type.rs b/crates/reporting/src/error/type.rs index e9ad9e9552b..6992db99c67 100644 --- a/crates/reporting/src/error/type.rs +++ b/crates/reporting/src/error/type.rs @@ -748,7 +748,7 @@ fn to_expr_report<'b>( }; let it_is = match annotation_source { - TypedIfBranch { index, .. } => format!("The {} branch is", index.ordinal()), + TypedIfBranch { .. } => "This branch is".to_string(), TypedWhenBranch { index, .. } => format!("The {} branch is", index.ordinal()), TypedBody { .. } => "The body is".into(), RequiredSymbol { .. } => "The provided type is".into(), @@ -4667,17 +4667,19 @@ fn type_problem_to_pretty<'b>( } } - (IntFloat, _) => alloc.tip().append(alloc.concat([ - alloc.reflow("You can convert between "), - alloc.type_str("Int"), - alloc.reflow(" and "), - alloc.type_str("Frac"), - alloc.reflow(" using functions like "), - alloc.symbol_qualified(Symbol::NUM_TO_FRAC), - alloc.reflow(" and "), - alloc.symbol_qualified(Symbol::NUM_ROUND), - alloc.reflow("."), - ])), + (IntFloat, _) => { + alloc.tip().append(alloc.concat( + [ + alloc.reflow( + "You can convert between integers and fractions using functions like ", + ), + alloc.symbol_qualified(Symbol::NUM_TO_FRAC), + alloc.reflow(" and "), + alloc.symbol_qualified(Symbol::NUM_ROUND), + alloc.reflow("."), + ], + )) + } (TagsMissing(missing), ExpectationContext::WhenCondition) => match missing.split_last() { None => alloc.nil(), diff --git a/crates/reporting/tests/test_reporting.rs b/crates/reporting/tests/test_reporting.rs index e4e5e067eff..32732ceb7d8 100644 --- a/crates/reporting/tests/test_reporting.rs +++ b/crates/reporting/tests/test_reporting.rs @@ -1064,8 +1064,8 @@ mod test_reporting { Every element in a list must have the same type! - Tip: You can convert between Int and Frac using functions like - `Num.toFrac` and `Num.round`. + Tip: You can convert between integers and fractions using functions + like `Num.toFrac` and `Num.round`. "### ); @@ -1532,7 +1532,7 @@ mod test_reporting { 5│ x = if Bool.true then 3.14 else 4 ^^^^ - The 1st branch is a fraction of type: + This branch is a fraction of type: Frac * @@ -1540,8 +1540,8 @@ mod test_reporting { Int * - Tip: You can convert between Int and Frac using functions like - `Num.toFrac` and `Num.round`. + Tip: You can convert between integers and fractions using functions + like `Num.toFrac` and `Num.round`. "### ); @@ -1575,8 +1575,8 @@ mod test_reporting { Int * - Tip: You can convert between Int and Frac using functions like - `Num.toFrac` and `Num.round`. + Tip: You can convert between integers and fractions using functions + like `Num.toFrac` and `Num.round`. "### ); @@ -1607,8 +1607,8 @@ mod test_reporting { Int * - Tip: You can convert between Int and Frac using functions like - `Num.toFrac` and `Num.round`. + Tip: You can convert between integers and fractions using functions + like `Num.toFrac` and `Num.round`. "### ); @@ -1928,8 +1928,8 @@ mod test_reporting { { x : Int * } - Tip: You can convert between Int and Frac using functions like - `Num.toFrac` and `Num.round`. + Tip: You can convert between integers and fractions using functions + like `Num.toFrac` and `Num.round`. "### ); @@ -2485,8 +2485,8 @@ mod test_reporting { Int * - Tip: You can convert between Int and Frac using functions like - `Num.toFrac` and `Num.round`. + Tip: You can convert between integers and fractions using functions + like `Num.toFrac` and `Num.round`. "### ); @@ -11001,7 +11001,7 @@ In roc, functions are always written as a lambda, like{} 5│ f = if Bool.true then {a: ""} else {a: "b", b: ""} ^^^^^^^ - The 1st branch is a record of type: + This branch is a record of type: { a : Str } diff --git a/www/generate_tutorial/src/tutorial.roc b/www/generate_tutorial/src/tutorial.roc index 545b816db2d..b03a16145e9 100644 --- a/www/generate_tutorial/src/tutorial.roc +++ b/www/generate_tutorial/src/tutorial.roc @@ -2,7 +2,7 @@ app "roc-tutorial" packages { pf: "../../../examples/static-site-gen/platform/main.roc" } imports [ pf.Html.{ html, head, body, footer, script, div, main, p, section, h1, h2, label, ol, input, text, nav, a, li, link, meta }, - pf.Html.Attributes.{ content, name, for, id, type, href, rel, lang, class, title, charset, src }, + pf.Html.Attributes.{ content, name, for, id, type, href, rel, lang, title, charset, src, role }, ] provides [transformFileContent] to pf @@ -36,9 +36,9 @@ view = \htmlContent -> viewNavbar : Html.Node viewNavbar = - div [id "top-bar"] [ + div [id "top-bar", role "presentation"] [ nav [] [ - a [class "home-link", href "/", title "The Roc Programming Language"] [text "roc"], + a [id "nav-home-link", href "/", title "The Roc Programming Language"] [text "roc"], div [id "top-bar-links"] [ a [href "/tutorial"] [text "tutorial"], a [href "https://github.com/roc-lang/roc/tree/main/getting_started"] [text "install"], diff --git a/www/public/logo.svg b/www/public/logo.svg deleted file mode 100644 index bb673d50139..00000000000 --- a/www/public/logo.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/www/public/repl/index.html b/www/public/repl/index.html index 28887eda6ec..011bc9cdf10 100644 --- a/www/public/repl/index.html +++ b/www/public/repl/index.html @@ -17,13 +17,13 @@
@@ -33,8 +33,8 @@ The rockin’ Roc REPL
-
-
+