Skip to content

Commit edfeb50

Browse files
authored
Merge pull request #813 from CEED/jeremy/fix-stray-unwraps
rust - fix some stray unwrap()s
2 parents 0b54870 + 51d0342 commit edfeb50

3 files changed

Lines changed: 9 additions & 15 deletions

File tree

examples/rust/ex1-volume/src/main.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,10 @@ fn example_1(options: opt::Opt) -> libceed::Result<()> {
8787
let ceed = Ceed::init(&ceed_spec);
8888

8989
// Mesh and solution bases
90-
let basis_mesh = ceed
91-
.basis_tensor_H1_Lagrange(dim, ncomp_x, mesh_degree + 1, num_qpts, QuadMode::Gauss)
92-
.unwrap();
93-
let basis_solution = ceed
94-
.basis_tensor_H1_Lagrange(dim, 1, solution_degree + 1, num_qpts, QuadMode::Gauss)
95-
.unwrap();
90+
let basis_mesh =
91+
ceed.basis_tensor_H1_Lagrange(dim, ncomp_x, mesh_degree + 1, num_qpts, QuadMode::Gauss)?;
92+
let basis_solution =
93+
ceed.basis_tensor_H1_Lagrange(dim, 1, solution_degree + 1, num_qpts, QuadMode::Gauss)?;
9694

9795
// Determine mesh size from approximate problem size
9896
let num_xyz = mesh::cartesian_mesh_size(dim, solution_degree, problem_size);

examples/rust/ex2-surface/src/main.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,10 @@ fn example_2(options: opt::Opt) -> libceed::Result<()> {
9292
let ceed = Ceed::init(&ceed_spec);
9393

9494
// Mesh and solution bases
95-
let basis_mesh = ceed
96-
.basis_tensor_H1_Lagrange(dim, ncomp_x, mesh_degree + 1, num_qpts, QuadMode::Gauss)
97-
.unwrap();
98-
let basis_solution = ceed
99-
.basis_tensor_H1_Lagrange(dim, 1, solution_degree + 1, num_qpts, QuadMode::Gauss)
100-
.unwrap();
95+
let basis_mesh =
96+
ceed.basis_tensor_H1_Lagrange(dim, ncomp_x, mesh_degree + 1, num_qpts, QuadMode::Gauss)?;
97+
let basis_solution =
98+
ceed.basis_tensor_H1_Lagrange(dim, 1, solution_degree + 1, num_qpts, QuadMode::Gauss)?;
10199

102100
// Determine mesh size from approximate problem size
103101
let num_xyz = mesh::cartesian_mesh_size(dim, solution_degree, problem_size);

examples/rust/mesh/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ pub fn cartesian_mesh_coords(
134134
}
135135

136136
// Lobatto points
137-
let lobatto_basis = ceed
138-
.basis_tensor_H1_Lagrange(1, 1, 2, p, QuadMode::GaussLobatto)
139-
.unwrap();
137+
let lobatto_basis = ceed.basis_tensor_H1_Lagrange(1, 1, 2, p, QuadMode::GaussLobatto)?;
140138
let nodes_corners = ceed.vector_from_slice(&[0.0, 1.0])?;
141139
let mut nodes_full = ceed.vector(p)?;
142140
lobatto_basis.apply(

0 commit comments

Comments
 (0)