Skip to content

fix: Remove return from val_or_panic #1999

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Mar 19, 2025
Merged

fix: Remove return from val_or_panic #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1764258
fix: Remove return from val_or_panic
croyzor Mar 19, 2025
85b9887
Doug/no libc (#2000)
doug-q Mar 19, 2025
7b927ce
Merge branch 'main' into cr/fix-u<->s-conversions
croyzor Mar 19, 2025
70cce10
Fix doc link
croyzor Mar 19, 2025
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions hugr-llvm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ insta = { workspace = true, optional = true }
rstest = { workspace = true, optional = true }
portgraph = { workspace = true, optional = true }
derive_more = { workspace = true, features = ["debug"] }
lazy_static.workspace = true

[dev-dependencies]
hugr-llvm = { "path" = ".", features = ["test-utils"] }
3 changes: 1 addition & 2 deletions hugr-llvm/src/emit/ops/cfg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,14 @@ mod test {

use crate::custom::CodegenExtsBuilder;
use crate::emit::test::SimpleHugrConfig;
use crate::extension::int::add_int_extensions;
use crate::test::{llvm_ctx, TestContext};

use crate::check_emission;
use crate::types::HugrType;

#[rstest]
fn diverse_outputs(mut llvm_ctx: TestContext) {
llvm_ctx.add_extensions(add_int_extensions);
llvm_ctx.add_extensions(CodegenExtsBuilder::add_default_int_extensions);
let t1 = INT_TYPES[0].clone();
let t2 = INT_TYPES[1].clone();
let es = ExtensionSet::from_iter([int_types::EXTENSION_ID, prelude::PRELUDE_ID]);
Expand Down
11 changes: 5 additions & 6 deletions hugr-llvm/src/emit/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ macro_rules! check_emission {
mod test_fns {
use super::*;
use crate::custom::CodegenExtsBuilder;
use crate::extension::int::add_int_extensions;
use crate::types::{HugrFuncType, HugrSumType};

use hugr_core::builder::DataflowSubContainer;
Expand Down Expand Up @@ -357,7 +356,8 @@ mod test_fns {

#[rstest]
fn emit_hugr_load_constant(mut llvm_ctx: TestContext) {
llvm_ctx.add_extensions(add_int_extensions);
llvm_ctx.add_extensions(CodegenExtsBuilder::add_default_int_extensions);

let v = Value::tuple([
Value::unit_sum(2, 4).unwrap(),
ConstInt::new_s(4, -24).unwrap().into(),
Expand Down Expand Up @@ -416,7 +416,7 @@ mod test_fns {

#[rstest]
fn emit_hugr_custom_op(mut llvm_ctx: TestContext) {
llvm_ctx.add_extensions(add_int_extensions);
llvm_ctx.add_extensions(CodegenExtsBuilder::add_default_int_extensions);
let v1 = ConstInt::new_s(4, -24).unwrap();
let v2 = ConstInt::new_s(4, 24).unwrap();

Expand Down Expand Up @@ -723,8 +723,7 @@ mod test_fns {

#[rstest]
fn tail_loop(mut llvm_ctx: TestContext, #[with(3, 7)] terminal_loop: Hugr) {
llvm_ctx.add_extensions(add_int_extensions);

llvm_ctx.add_extensions(CodegenExtsBuilder::add_default_int_extensions);
check_emission!(terminal_loop, llvm_ctx);
}

Expand All @@ -738,7 +737,7 @@ mod test_fns {
#[case] input: u64,
#[with(iters, input)] terminal_loop: Hugr,
) {
exec_ctx.add_extensions(add_int_extensions);
exec_ctx.add_extensions(CodegenExtsBuilder::add_default_int_extensions);
assert_eq!(
input << (iters + 1),
exec_ctx.exec_hugr_u64(terminal_loop, "main")
Expand Down
12 changes: 6 additions & 6 deletions hugr-llvm/src/extension/collections/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ mod test {
exec_ctx.add_extensions(|cge| {
cge.add_default_prelude_extensions()
.add_default_array_extensions()
.add_int_extensions()
.add_default_int_extensions()
.add_logic_extensions()
});
assert_eq!(1, exec_ctx.exec_hugr_u64(hugr, "main"));
Expand Down Expand Up @@ -1073,7 +1073,7 @@ mod test {
exec_ctx.add_extensions(|cge| {
cge.add_default_prelude_extensions()
.add_default_array_extensions()
.add_int_extensions()
.add_default_int_extensions()
.add_logic_extensions()
});
assert_eq!(1, exec_ctx.exec_hugr_u64(hugr, "main"));
Expand Down Expand Up @@ -1142,7 +1142,7 @@ mod test {
exec_ctx.add_extensions(|cge| {
cge.add_default_prelude_extensions()
.add_default_array_extensions()
.add_int_extensions()
.add_default_int_extensions()
});
assert_eq!(expected, exec_ctx.exec_hugr_u64(hugr, "main"));
}
Expand Down Expand Up @@ -1196,7 +1196,7 @@ mod test {
exec_ctx.add_extensions(|cge| {
cge.add_default_prelude_extensions()
.add_default_array_extensions()
.add_int_extensions()
.add_default_int_extensions()
});
assert_eq!(value, exec_ctx.exec_hugr_u64(hugr, "main"));
}
Expand Down Expand Up @@ -1271,7 +1271,7 @@ mod test {
exec_ctx.add_extensions(|cge| {
cge.add_default_prelude_extensions()
.add_default_array_extensions()
.add_int_extensions()
.add_default_int_extensions()
});
let expected: u64 = (inc..size + inc).sum();
assert_eq!(expected, exec_ctx.exec_hugr_u64(hugr, "main"));
Expand Down Expand Up @@ -1333,7 +1333,7 @@ mod test {
exec_ctx.add_extensions(|cge| {
cge.add_default_prelude_extensions()
.add_default_array_extensions()
.add_int_extensions()
.add_default_int_extensions()
});
let expected: u64 = (0..size).sum();
assert_eq!(expected, exec_ctx.exec_hugr_u64(hugr, "main"));
Expand Down
18 changes: 9 additions & 9 deletions hugr-llvm/src/extension/conversions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ mod test {
#[case("convert_s", 5)]
fn test_convert(mut llvm_ctx: TestContext, #[case] op_name: &str, #[case] log_width: u8) -> () {
llvm_ctx.add_extensions(|ceb| {
ceb.add_int_extensions()
ceb.add_default_int_extensions()
.add_float_extensions()
.add_conversion_extensions()
});
Expand All @@ -338,7 +338,7 @@ mod test {
) -> () {
llvm_ctx.add_extensions(|builder| {
builder
.add_int_extensions()
.add_default_int_extensions()
.add_float_extensions()
.add_conversion_extensions()
.add_default_prelude_extensions()
Expand All @@ -364,7 +364,7 @@ mod test {
let [in_t, out_t] = tys;
llvm_ctx.add_extensions(|builder| {
builder
.add_int_extensions()
.add_default_int_extensions()
.add_float_extensions()
.add_conversion_extensions()
});
Expand Down Expand Up @@ -419,7 +419,7 @@ mod test {
});
exec_ctx.add_extensions(|builder| {
builder
.add_int_extensions()
.add_default_int_extensions()
.add_conversion_extensions()
.add_default_prelude_extensions()
});
Expand Down Expand Up @@ -489,7 +489,7 @@ mod test {
.add_conversion_extensions()
.add_default_prelude_extensions()
.add_float_extensions()
.add_int_extensions()
.add_default_int_extensions()
});
}

Expand Down Expand Up @@ -617,7 +617,7 @@ mod test {
builder
.add_conversion_extensions()
.add_default_prelude_extensions()
.add_int_extensions()
.add_default_int_extensions()
});
assert_eq!(i * 5 + 1, exec_ctx.exec_hugr_u64(hugr, "main"));
}
Expand All @@ -639,7 +639,7 @@ mod test {
builder
.add_conversion_extensions()
.add_default_prelude_extensions()
.add_int_extensions()
.add_default_int_extensions()
});
assert_eq!(i, exec_ctx.exec_hugr_u64(hugr, "main"));
}
Expand Down Expand Up @@ -667,7 +667,7 @@ mod test {
builder
.add_conversion_extensions()
.add_default_prelude_extensions()
.add_int_extensions()
.add_default_int_extensions()
.add_float_extensions()
});
let hugr_f = exec_ctx.exec_hugr_f64(hugr, "main");
Expand All @@ -694,7 +694,7 @@ mod test {
builder
.add_conversion_extensions()
.add_default_prelude_extensions()
.add_int_extensions()
.add_default_int_extensions()
.add_float_extensions()
});
assert_eq!(f.to_bits(), exec_ctx.exec_hugr_u64(hugr, "main"));
Expand Down
Loading
Loading