language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 22:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #5857 from roc-lang/rust-1-71-1-upgrade

Browse source 
rust 1.71.1 upgrade
This commit is contained in:
Anton-4 2023-09-26 17:27:08 +02:00 • committed by GitHub
commit cb13fc6092
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 106 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/nix_macos_apple_silicon.yml vendored
View file

@ -27,7 +27,7 @@ jobs:
run: nix develop -c cargo clippy --workspace --tests -- --deny warnings run: nix develop -c cargo clippy --workspace --tests -- --deny warnings
- name: check code style with clippy --release - name: check code style with clippy --release
run: cargo clippy --workspace --tests --release -- --deny warnings run: nix develop -c cargo clippy --workspace --tests --release -- --deny warnings
- name: test building default.nix - name: test building default.nix
run: nix-build run: nix-build

4
.github/workflows/windows_release_build.yml vendored
View file

@ -33,8 +33,8 @@ jobs:
- name: zig version - name: zig version
run: zig version run: zig version
- name: install rust nightly 1.70.0 - name: install rust nightly 1.71.0
run: rustup install nightly-2023-04-15 run: rustup install nightly-2023-05-28
- name: set up llvm 13 - name: set up llvm 13
run: | run: |

4
.github/workflows/windows_tests.yml vendored
View file

@ -41,8 +41,8 @@ jobs:
cd crates\compiler\builtins\bitcode\ cd crates\compiler\builtins\bitcode\
zig build test zig build test
- name: install rust nightly 1.70.0 - name: install rust nightly 1.71.0
run: rustup install nightly-2023-04-15 run: rustup install nightly-2023-05-28
- name: set up llvm 13 - name: set up llvm 13
run: | run: |

2
Earthfile
View file

@ -1,6 +1,6 @@
VERSION 0.6 VERSION 0.6
FROM rust:1.70.0-slim-buster # make sure to update rust-toolchain.toml too so that everything uses the same rust version FROM rust:1.71.1-slim-buster # make sure to update rust-toolchain.toml too so that everything uses the same rust version
WORKDIR /earthbuild WORKDIR /earthbuild
prep-debian: prep-debian:

2
crates/cli/tests/cli_run.rs
View file

@ -793,7 +793,7 @@ mod cli_run {
} }
#[test] #[test]
#[cfg_attr(windows, ignore)] #[cfg_attr(any(target_os = "windows", target_os = "linux"), ignore = "Segfault")]
fn false_interpreter() { fn false_interpreter() {
test_roc_app( test_roc_app(
"examples/cli/false-interpreter", "examples/cli/false-interpreter",

2
crates/compiler/build/src/link.rs
View file

@ -531,7 +531,7 @@ pub fn rebuild_host(
// on windows, we need the nightly toolchain so we can use `-Z export-executable-symbols` // on windows, we need the nightly toolchain so we can use `-Z export-executable-symbols`
// using `+nightly` only works when running cargo through rustup // using `+nightly` only works when running cargo through rustup
let mut cmd = rustup(); let mut cmd = rustup();
cmd.args(["run", "nightly-2023-04-15", "cargo"]); cmd.args(["run", "nightly-2023-05-28", "cargo"]);
cmd cmd
} else { } else {

4
crates/compiler/mono/src/ir.rs
View file

@ -77,8 +77,8 @@ roc_error_macros::assert_sizeof_wasm!(Call, 44);
roc_error_macros::assert_sizeof_wasm!(CallType, 36); roc_error_macros::assert_sizeof_wasm!(CallType, 36);
roc_error_macros::assert_sizeof_non_wasm!(Literal, 3 * 8); roc_error_macros::assert_sizeof_non_wasm!(Literal, 3 * 8);
roc_error_macros::assert_sizeof_non_wasm!(Expr, 10 * 8); roc_error_macros::assert_sizeof_non_wasm!(Expr, 9 * 8);
roc_error_macros::assert_sizeof_non_wasm!(Stmt, 13 * 8); roc_error_macros::assert_sizeof_non_wasm!(Stmt, 12 * 8);
roc_error_macros::assert_sizeof_non_wasm!(ProcLayout, 5 * 8); roc_error_macros::assert_sizeof_non_wasm!(ProcLayout, 5 * 8);
roc_error_macros::assert_sizeof_non_wasm!(Call, 9 * 8); roc_error_macros::assert_sizeof_non_wasm!(Call, 9 * 8);
roc_error_macros::assert_sizeof_non_wasm!(CallType, 7 * 8); roc_error_macros::assert_sizeof_non_wasm!(CallType, 7 * 8);

20
crates/compiler/test_gen/src/gen_abilities.rs
View file

@ -808,7 +808,7 @@ fn encode_derived_list_of_lists_of_strings() {
#[test] #[test]
#[cfg(not(debug_assertions))] #[cfg(not(debug_assertions))]
#[cfg(all(any(feature = "gen-llvm", feature = "gen-wasm")))] #[cfg(any(feature = "gen-llvm", feature = "gen-wasm"))]
fn encode_derived_record_with_many_types() { fn encode_derived_record_with_many_types() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -882,7 +882,7 @@ fn encode_derived_tuple_of_tuples() {
#[test] #[test]
#[cfg(not(debug_assertions))] #[cfg(not(debug_assertions))]
#[cfg(all(any(feature = "gen-llvm", feature = "gen-wasm")))] #[cfg(any(feature = "gen-llvm", feature = "gen-wasm"))]
fn encode_derived_generic_record_with_different_field_types() { fn encode_derived_generic_record_with_different_field_types() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -908,7 +908,7 @@ fn encode_derived_generic_record_with_different_field_types() {
} }
#[test] #[test]
#[cfg(all(any(feature = "gen-llvm", feature = "gen-wasm")))] #[cfg(any(feature = "gen-llvm", feature = "gen-wasm"))]
fn encode_derived_generic_tag_with_different_field_types() { fn encode_derived_generic_tag_with_different_field_types() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1057,13 +1057,13 @@ mod decode_immediate {
#[cfg(all(test, any(feature = "gen-llvm", feature = "gen-wasm")))] #[cfg(all(test, any(feature = "gen-llvm", feature = "gen-wasm")))]
use indoc::indoc; use indoc::indoc;
#[cfg(all(test, any(feature = "gen-llvm")))] #[cfg(all(test, feature = "gen-llvm"))]
use roc_std::RocStr; use roc_std::RocStr;
use crate::helpers::with_larger_debug_stack; use crate::helpers::with_larger_debug_stack;
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn string() { fn string() {
with_larger_debug_stack(|| { with_larger_debug_stack(|| {
assert_evals_to!( assert_evals_to!(
@ -1084,7 +1084,7 @@ mod decode_immediate {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn ranged_number() { fn ranged_number() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1106,7 +1106,7 @@ mod decode_immediate {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn bool() { fn bool() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1127,7 +1127,7 @@ mod decode_immediate {
macro_rules! num_immediate { macro_rules! num_immediate {
($($num:expr, $typ:ident)*) => {$( ($($num:expr, $typ:ident)*) => {$(
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn $typ() { fn $typ() {
assert_evals_to!( assert_evals_to!(
&format!(indoc!( &format!(indoc!(
@ -1206,7 +1206,7 @@ fn decode_list_of_strings() {
} }
#[test] #[test]
#[cfg(all(any(feature = "gen-llvm", feature = "gen-wasm")))] #[cfg(any(feature = "gen-llvm", feature = "gen-wasm"))]
fn encode_then_decode_list_of_strings() { fn encode_then_decode_list_of_strings() {
with_larger_debug_stack(|| { with_larger_debug_stack(|| {
assert_evals_to!( assert_evals_to!(
@ -1227,7 +1227,7 @@ fn encode_then_decode_list_of_strings() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
#[ignore = "#3696: Currently hits some weird panic in borrow checking, not sure if it's directly related to abilities."] #[ignore = "#3696: Currently hits some weird panic in borrow checking, not sure if it's directly related to abilities."]
fn encode_then_decode_list_of_lists_of_strings() { fn encode_then_decode_list_of_lists_of_strings() {
with_larger_debug_stack(|| { with_larger_debug_stack(|| {

4
crates/compiler/test_gen/src/gen_erased.rs
View file

@ -4,7 +4,7 @@ use crate::helpers::llvm::assert_evals_to_erased;
use indoc::indoc; use indoc::indoc;
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn capture_multiple() { fn capture_multiple() {
assert_evals_to_erased!( assert_evals_to_erased!(
indoc!( indoc!(
@ -23,7 +23,7 @@ fn capture_multiple() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn multi_branch_capturing() { fn multi_branch_capturing() {
assert_evals_to_erased!( assert_evals_to_erased!(
indoc!( indoc!(

2
crates/compiler/test_gen/src/gen_list.rs
View file

@ -3014,7 +3014,7 @@ fn list_all() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn list_all_empty_with_unknown_element_type() { fn list_all_empty_with_unknown_element_type() {
assert_evals_to!("List.all [] (\\_ -> Bool.true)", true, bool); assert_evals_to!("List.all [] (\\_ -> Bool.true)", true, bool);
} }

8
crates/compiler/test_gen/src/gen_num.rs
View file

@ -1558,7 +1558,7 @@ fn tail_call_elimination() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-dev"))] #[cfg(feature = "gen-dev")]
fn int_negate_dev() { fn int_negate_dev() {
// TODO // TODO
// dev backend yet to have `Num.maxI64` or `Num.minI64`. // dev backend yet to have `Num.maxI64` or `Num.minI64`.
@ -2317,7 +2317,7 @@ fn min_f32() {
} }
#[test] #[test]
#[cfg(all(any(feature = "gen-llvm"), not(feature = "gen-llvm-wasm")))] #[cfg(all(feature = "gen-llvm", not(feature = "gen-llvm-wasm")))]
fn to_nat_truncate_wraps() { fn to_nat_truncate_wraps() {
let input = "Num.toNat 10_000_000_000_000_000_000_000i128"; let input = "Num.toNat 10_000_000_000_000_000_000_000i128";
assert_evals_to!(input, 1864712049423024128, u64) assert_evals_to!(input, 1864712049423024128, u64)
@ -3885,7 +3885,7 @@ fn num_abs_diff_int() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn num_abs_diff_large_bits() { fn num_abs_diff_large_bits() {
assert_evals_to!(r#"Num.absDiff 0u128 0u128"#, 0, u128); assert_evals_to!(r#"Num.absDiff 0u128 0u128"#, 0, u128);
assert_evals_to!(r#"Num.absDiff 1u128 2u128"#, 1, u128); assert_evals_to!(r#"Num.absDiff 1u128 2u128"#, 1, u128);
@ -3918,7 +3918,7 @@ fn num_abs_int_min_overflow() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
#[should_panic(expected = r#"Roc failed with message: "integer subtraction overflowed!"#)] #[should_panic(expected = r#"Roc failed with message: "integer subtraction overflowed!"#)]
fn num_abs_large_bits_min_overflow() { fn num_abs_large_bits_min_overflow() {
assert_evals_to!(r#"Num.absDiff Num.minI128 0"#, 0, i128); assert_evals_to!(r#"Num.absDiff Num.minI128 0"#, 0, i128);

2
crates/compiler/test_gen/src/gen_primitives.rs
View file

@ -4460,7 +4460,7 @@ fn layout_cache_structure_with_multiple_recursive_structures() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn reset_recursive_type_wraps_in_named_type() { fn reset_recursive_type_wraps_in_named_type() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(

44
crates/compiler/test_gen/src/gen_refcount.rs
View file

@ -13,7 +13,7 @@ use roc_std::{RocList, RocStr};
type Pointer = usize; type Pointer = usize;
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn str_inc() { fn str_inc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -32,7 +32,7 @@ fn str_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn str_dealloc() { fn str_dealloc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -48,7 +48,7 @@ fn str_dealloc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn list_int_inc() { fn list_int_inc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -66,7 +66,7 @@ fn list_int_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn list_int_dealloc() { fn list_int_dealloc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -84,7 +84,7 @@ fn list_int_dealloc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn list_str_inc() { fn list_str_inc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -104,7 +104,7 @@ fn list_str_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn list_str_dealloc() { fn list_str_dealloc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -124,7 +124,7 @@ fn list_str_dealloc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn struct_inc() { fn struct_inc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -141,7 +141,7 @@ fn struct_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn struct_dealloc() { fn struct_dealloc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -159,7 +159,7 @@ fn struct_dealloc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn union_nonrecursive_inc() { fn union_nonrecursive_inc() {
type TwoStr = (RocStr, RocStr, i64); type TwoStr = (RocStr, RocStr, i64);
@ -185,7 +185,7 @@ fn union_nonrecursive_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn union_nonrecursive_dec() { fn union_nonrecursive_dec() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -208,7 +208,7 @@ fn union_nonrecursive_dec() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn union_recursive_inc() { fn union_recursive_inc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -236,7 +236,7 @@ fn union_recursive_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn union_recursive_dec() { fn union_recursive_dec() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -266,7 +266,7 @@ fn union_recursive_dec() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn refcount_different_rosetrees_inc() { fn refcount_different_rosetrees_inc() {
// Requires two different Inc procedures for `List (Rose I64)` and `List (Rose Str)` // Requires two different Inc procedures for `List (Rose I64)` and `List (Rose Str)`
// even though both appear in the mono Layout as `List(RecursivePointer)` // even though both appear in the mono Layout as `List(RecursivePointer)`
@ -306,7 +306,7 @@ fn refcount_different_rosetrees_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn refcount_different_rosetrees_dec() { fn refcount_different_rosetrees_dec() {
// Requires two different Dec procedures for `List (Rose I64)` and `List (Rose Str)` // Requires two different Dec procedures for `List (Rose I64)` and `List (Rose Str)`
// even though both appear in the mono Layout as `List(RecursivePointer)` // even though both appear in the mono Layout as `List(RecursivePointer)`
@ -347,7 +347,7 @@ fn refcount_different_rosetrees_dec() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn union_linked_list_inc() { fn union_linked_list_inc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -373,7 +373,7 @@ fn union_linked_list_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn union_linked_list_dec() { fn union_linked_list_dec() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -401,7 +401,7 @@ fn union_linked_list_dec() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn union_linked_list_nil_dec() { fn union_linked_list_nil_dec() {
let no_refcounts: &[crate::helpers::RefCount] = &[]; let no_refcounts: &[crate::helpers::RefCount] = &[];
assert_refcounts!( assert_refcounts!(
@ -423,7 +423,7 @@ fn union_linked_list_nil_dec() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn union_linked_list_long_dec() { fn union_linked_list_long_dec() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -455,7 +455,7 @@ fn union_linked_list_long_dec() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn boxed_str_inc() { fn boxed_str_inc() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -475,7 +475,7 @@ fn boxed_str_inc() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn boxed_str_dec() { fn boxed_str_dec() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -498,7 +498,7 @@ fn boxed_str_dec() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn non_nullable_unwrapped_alignment_8() { fn non_nullable_unwrapped_alignment_8() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(
@ -528,7 +528,7 @@ fn non_nullable_unwrapped_alignment_8() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn reset_reuse_alignment_8() { fn reset_reuse_alignment_8() {
assert_refcounts!( assert_refcounts!(
indoc!( indoc!(

32
crates/compiler/test_gen/src/gen_set.rs
View file

@ -1,5 +1,5 @@
#![cfg(all( #![cfg(all(
any(feature = "gen-llvm"), feature = "gen-llvm",
not(debug_assertions) // https://github.com/roc-lang/roc/issues/3898 not(debug_assertions) // https://github.com/roc-lang/roc/issues/3898
))] ))]
@ -16,7 +16,7 @@ use indoc::indoc;
use roc_std::RocList; use roc_std::RocList;
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn empty_len() { fn empty_len() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -30,7 +30,7 @@ fn empty_len() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn single_len() { fn single_len() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -44,7 +44,7 @@ fn single_len() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn single_to_list() { fn single_to_list() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -68,7 +68,7 @@ fn single_to_list() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn insert() { fn insert() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -86,7 +86,7 @@ fn insert() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn remove() { fn remove() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -105,7 +105,7 @@ fn remove() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn union() { fn union() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -126,7 +126,7 @@ fn union() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn difference() { fn difference() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -147,7 +147,7 @@ fn difference() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn intersection() { fn intersection() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -168,7 +168,7 @@ fn intersection() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn walk_sum() { fn walk_sum() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -182,7 +182,7 @@ fn walk_sum() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn contains() { fn contains() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -206,7 +206,7 @@ fn contains() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn from_list() { fn from_list() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -238,7 +238,7 @@ fn from_list() {
#[test] #[test]
#[ignore] #[ignore]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn from_list_void() { fn from_list_void() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -254,7 +254,7 @@ fn from_list_void() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn to_list_empty() { fn to_list_empty() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -268,7 +268,7 @@ fn to_list_empty() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn from_list_result() { fn from_list_result() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -289,7 +289,7 @@ fn from_list_result() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn resolve_set_eq_issue_4671() { fn resolve_set_eq_issue_4671() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(

48
crates/compiler/test_gen/src/gen_str.rs
View file

@ -868,7 +868,7 @@ fn str_clone() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn nested_recursive_literal() { fn nested_recursive_literal() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1160,7 +1160,7 @@ fn str_trim_large_to_small_unique() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_large_to_large_shared() { fn str_trim_large_to_large_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1180,7 +1180,7 @@ fn str_trim_large_to_large_shared() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_large_to_small_shared() { fn str_trim_large_to_small_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1200,7 +1200,7 @@ fn str_trim_large_to_small_shared() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_small_to_small_shared() { fn str_trim_small_to_small_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1253,7 +1253,7 @@ fn str_trim_start_large_to_small_unique() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_start_large_to_large_shared() { fn str_trim_start_large_to_large_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1273,7 +1273,7 @@ fn str_trim_start_large_to_large_shared() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_start_large_to_small_shared() { fn str_trim_start_large_to_small_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1293,7 +1293,7 @@ fn str_trim_start_large_to_small_shared() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_start_small_to_small_shared() { fn str_trim_start_small_to_small_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1346,7 +1346,7 @@ fn str_trim_end_large_to_small_unique() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_end_large_to_large_shared() { fn str_trim_end_large_to_large_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1366,7 +1366,7 @@ fn str_trim_end_large_to_large_shared() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_end_large_to_small_shared() { fn str_trim_end_large_to_small_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1386,7 +1386,7 @@ fn str_trim_end_large_to_small_shared() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_trim_end_small_to_small_shared() { fn str_trim_end_small_to_small_shared() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1417,7 +1417,7 @@ fn str_to_nat() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_i128() { fn str_to_i128() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1431,7 +1431,7 @@ fn str_to_i128() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_u128() { fn str_to_u128() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1473,7 +1473,7 @@ fn str_to_u64() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_i32() { fn str_to_i32() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1487,7 +1487,7 @@ fn str_to_i32() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_u32() { fn str_to_u32() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1501,7 +1501,7 @@ fn str_to_u32() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_i16() { fn str_to_i16() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1515,7 +1515,7 @@ fn str_to_i16() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_u16() { fn str_to_u16() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1529,7 +1529,7 @@ fn str_to_u16() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_i8() { fn str_to_i8() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1543,7 +1543,7 @@ fn str_to_i8() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_u8() { fn str_to_u8() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1557,7 +1557,7 @@ fn str_to_u8() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_f64() { fn str_to_f64() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1574,7 +1574,7 @@ fn str_to_f64() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_f32() { fn str_to_f32() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1591,7 +1591,7 @@ fn str_to_f32() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_to_dec() { fn str_to_dec() {
use roc_std::RocDec; use roc_std::RocDec;
@ -1910,7 +1910,7 @@ fn str_walk_utf8_with_index() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn str_append_scalar() { fn str_append_scalar() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1938,7 +1938,7 @@ fn str_walk_scalars() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm-wasm"))] #[cfg(feature = "gen-llvm-wasm")]
fn llvm_wasm_str_layout() { fn llvm_wasm_str_layout() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(
@ -1954,7 +1954,7 @@ fn llvm_wasm_str_layout() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm-wasm"))] #[cfg(feature = "gen-llvm-wasm")]
fn llvm_wasm_str_layout_small() { fn llvm_wasm_str_layout_small() {
// exposed an error in using bitcast instead of zextend // exposed an error in using bitcast instead of zextend
assert_evals_to!( assert_evals_to!(

2
crates/compiler/test_gen/src/gen_tags.rs
View file

@ -1381,7 +1381,7 @@ fn issue_2445() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn issue_2458() { fn issue_2458() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(

2
crates/compiler/test_gen/src/gen_tuples.rs
View file

@ -319,7 +319,7 @@ fn bool_tuple4_literal() {
// Not supported by wasm because of the size of the tuple: // Not supported by wasm because of the size of the tuple:
// FromWasm32Memory is only implemented for tuples of up to 4 elements // FromWasm32Memory is only implemented for tuples of up to 4 elements
#[test] #[test]
#[cfg(any(feature = "gen-llvm"))] #[cfg(feature = "gen-llvm")]
fn i64_tuple9_literal() { fn i64_tuple9_literal() {
assert_evals_to!( assert_evals_to!(
indoc!( indoc!(

4
crates/compiler/test_gen/src/wasm_str.rs
View file

@ -265,7 +265,7 @@ fn str_concat_big_to_big() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn small_str_literal() { fn small_str_literal() {
assert_evals_to!( assert_evals_to!(
"\"01234567890\"", "\"01234567890\"",
@ -275,7 +275,7 @@ fn small_str_literal() {
} }
#[test] #[test]
#[cfg(any(feature = "gen-wasm"))] #[cfg(feature = "gen-wasm")]
fn small_str_zeroed_literal() { fn small_str_zeroed_literal() {
// Verifies that we zero out unused bytes in the string. // Verifies that we zero out unused bytes in the string.
// This is important so that string equality tests don't randomly // This is important so that string equality tests don't randomly

2
examples/glue/rust-platform/rust-toolchain.toml
View file

@ -1,5 +1,5 @@
[toolchain] [toolchain]
channel = "1.65.0" channel = "1.71.1"
profile = "default" profile = "default"

2
examples/platform-switching/rust-platform/rust-toolchain.toml
View file

@ -1,5 +1,5 @@
[toolchain] [toolchain]
channel = "1.70.0" channel = "1.71.1"
profile = "default" profile = "default"

14
flake.lock generated
View file

@ -43,17 +43,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1690279121, "lastModified": 1693140250,
"narHash": "sha256-XoPGhV1UJQPue6RiehAu7lQwKss3J1B/K0QtVOMD83A=", "narHash": "sha256-URyIDETtu1bbxcSl83xp7irEV04dPEgj7O3LjHcD1Sk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "821c72743ceae44bdd09718d47cab98fd5fd90af", "rev": "676fe5e01b9a41fa14aaa48d87685677664104b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "821c72743ceae44bdd09718d47cab98fd5fd90af", "rev": "676fe5e01b9a41fa14aaa48d87685677664104b1",
"type": "github" "type": "github"
} }
}, },
@ -75,11 +75,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690252178, "lastModified": 1695694299,
"narHash": "sha256-9oEz822bvbHobfCUjJLDor2BqW3I5tycIauzDlzOALY=", "narHash": "sha256-0CucEiOZzOVHwmGDJKNXLj7aDYOqbRtqChp9nbGrh18=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "8d64353ca827002fb8459e44d49116c78d868eba", "rev": "c89a55d2d91cf55234466934b25deeffa365188a",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -2,7 +2,7 @@
description = "Roc flake"; description = "Roc flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?rev=821c72743ceae44bdd09718d47cab98fd5fd90af"; nixpkgs.url = "github:nixos/nixpkgs?rev=676fe5e01b9a41fa14aaa48d87685677664104b1";
# rust from nixpkgs has some libc problems, this is patched in the rust-overlay # rust from nixpkgs has some libc problems, this is patched in the rust-overlay
rust-overlay = { rust-overlay = {

4
rust-toolchain.toml
View file

@ -11,9 +11,9 @@
# - update nightly-OLD_DATE in crates/compiler/build/src/link.rs # - update nightly-OLD_DATE in crates/compiler/build/src/link.rs
# - Follow instructions in default.nix: `assert pkgs.lib.assertMsg rustVersionsMatch` ... # - Follow instructions in default.nix: `assert pkgs.lib.assertMsg rustVersionsMatch` ...
channel = "1.70.0" # check ^^^ when changing this channel = "1.71.1" # check ^^^ when changing this
# #
# channel = "nightly-2023-04-15" # 1.70.0 nightly to be able to use unstable features # channel = "nightly-2023-05-28" # 1.71.0 nightly to be able to use unstable features
profile = "default" profile = "default"
components = [ components = [
# for usages of rust-analyzer or similar tools inside `nix develop` # for usages of rust-analyzer or similar tools inside `nix develop`