Fix clang-tidy checks, including some use-after-move

.clang-tidy

@@ -12,13 +12,21 @@ Checks: |
   -cppcoreguidelines-pro-bounds-pointer-arithmetic
   -cppcoreguidelines-init-variables
   -cppcoreguidelines-pro-type-member-init
+  -cppcoreguidelines-avoid-do-while
+  -cppcoreguidelines-pro-type-const-cast
+  -cppcoreguidelines-pro-bounds-array-to-pointer-decay
+  -cppcoreguidelines-avoid-const-or-ref-data-members
+  -cppcoreguidelines-pro-bounds-constant-array-index
   bugprone-*
   -bugprone-sizeof-expression
   -bugprone-narrowing-conversions
   -bugprone-macro-parentheses
+  -bugprone-easily-swappable-parameters
+  -bugprone-implicit-widening-of-multiplication-result
 CheckOptions:
   cppcoreguidelines-macro-usage.CheckCapsOnly: true
   cppcoreguidelines-avoid-do-while.IgnoreMacros: true
+  cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreNonDeducedTemplateTypes: true
 HeaderFilterRegex: ''
 FormatStyle: file
 ...

src/accel/LocalTransporter.cc

@@ -105,6 +105,9 @@ LocalTransporter::LocalTransporter(SetupOptions const& options,
     inp.num_track_slots = options.max_num_tracks;
     inp.action_times = options.action_times;
 
+    // Set stream ID for finalizing
+    hit_manager_.finalizer(HMFinalizer{inp.stream_id});
+
     if (celeritas::device())
     {
         step_ = std::make_shared<Stepper<MemSpace::device>>(std::move(inp));
@@ -113,9 +116,6 @@ LocalTransporter::LocalTransporter(SetupOptions const& options,
     {
         step_ = std::make_shared<Stepper<MemSpace::host>>(std::move(inp));
     }
-
-    // Set stream ID for finalizing
-    hit_manager_.finalizer(HMFinalizer{inp.stream_id});
 }
 
 //---------------------------------------------------------------------------//

src/celeritas/global/Stepper.cc

@@ -31,14 +31,12 @@ template<MemSpace M>
 Stepper<M>::Stepper(Input input)
     : params_(std::move(input.params))
     , state_(*params_, input.stream_id, input.num_track_slots)
-{
-    // Create action sequence
-    actions_ = [&] {
+    , actions_{[&] {
         ActionSequence::Options opts;
         opts.action_times = input.action_times;
         return std::make_shared<ActionSequence>(*params_->action_reg(), opts);
-    }();
-
+    }()}
+{
     // Execute beginning-of-run action
     ScopedProfiling profile_this{"begin-run"};
     actions_->begin_run(*params_, state_);

src/celeritas/global/Stepper.hh

@@ -156,11 +156,12 @@ class Stepper final : public StepperInterface
     CoreStateInterface const& state() const final { return state_; }
 
   private:
-    // Params and call sequence
+    // Params data
     std::shared_ptr<CoreParams const> params_;
-    std::shared_ptr<ActionSequence> actions_;
     // State data
     CoreState<M> state_;
+    // Call sequence
+    std::shared_ptr<ActionSequence> actions_;
 };
 
 //---------------------------------------------------------------------------//

src/celeritas/grid/ValueGridBuilder.cc

@@ -156,7 +156,7 @@ ValueGridXsBuilder::ValueGridXsBuilder(double emin,
     CELER_EXPECT(xs_.size() >= 2);
     CELER_EXPECT(
         is_on_grid_point(log_eprime_, log_emin_, log_emax_, xs_.size() - 1));
-    CELER_EXPECT(is_nonnegative(make_span(xs)));
+    CELER_EXPECT(is_nonnegative(make_span(xs_)));
 }
 
 //---------------------------------------------------------------------------//

src/celeritas/io/detail/ImportDataConverter.cc

@@ -21,13 +21,14 @@ namespace detail
 /*!
  * Construct with a unit system.
  */
-ImportDataConverter::ImportDataConverter(UnitSystem usys) : usys_{usys}
+ImportDataConverter::ImportDataConverter(UnitSystem usys)
+    : usys_{usys}
+    , len_(native_value_from(usys_, ImportUnits::len))
+    , numdens_(native_value_from(usys_, ImportUnits::inv_len_cb))
+    , time_(native_value_from(usys_, ImportUnits::time))
+    , xs_(native_value_from(usys_, ImportModelMaterial::xs_units))
+    , inv_pressure_(native_value_from(usys_, ImportUnits::len_time_sq_per_mass))
 {
-    len_ = native_value_from(usys_, ImportUnits::len);
-    numdens_ = native_value_from(usys_, ImportUnits::inv_len_cb);
-    time_ = native_value_from(usys_, ImportUnits::time);
-    xs_ = native_value_from(usys_, ImportModelMaterial::xs_units);
-    inv_pressure_ = native_value_from(usys_, ImportUnits::len_time_sq_per_mass);
 }
 
 //---------------------------------------------------------------------------//

src/corecel/io/OutputRegistry.cc

@@ -65,14 +65,12 @@ void OutputRegistry::output(JsonPimpl* j) const
             if (is_global)
             {
                 json_wrap.obj = std::move(cat_result);
-            }
-            kv.second->output(&json_wrap);
-            if (is_global)
-            {
+                kv.second->output(&json_wrap);
                 cat_result = std::move(json_wrap.obj);
             }
             else
             {
+                kv.second->output(&json_wrap);
                 cat_result[kv.first] = std::move(json_wrap.obj);
             }
         }

src/geocel/ScopedGeantLogger.cc

@@ -108,12 +108,12 @@ G4int log_impl(G4String const& str, LogLevel level)
 /*!
  * Send Geant4 log messages to Celeritas' world logger.
  */
-class GeantLoggerAdapter : public G4coutDestination
+class GeantLoggerAdapter final : public G4coutDestination
 {
   public:
     // Assign to Geant handlers on construction
     GeantLoggerAdapter();
-    ~GeantLoggerAdapter();
+    ~GeantLoggerAdapter() final;
 
     // Handle error messages
     G4int ReceiveG4cout(G4String const& str) final;

src/orange/orangeinp/Solid.cc

@@ -144,7 +144,7 @@ Solid<T>::Solid(std::string&& label,
     , exclusion_{std::move(excluded)}
     , enclosed_{std::move(enclosed)}
 {
-    CELER_VALIDATE(exclusion_ || enclosed,
+    CELER_VALIDATE(exclusion_ || enclosed_,
                    << "solid requires either an excluded region or a shape");
     CELER_VALIDATE(!exclusion_ || interior_.encloses(*exclusion_),
                    << "solid '" << this->label()

src/orange/orangeinp/detail/ProtoBuilder.cc

@@ -24,10 +24,10 @@ namespace detail
  */
 ProtoBuilder::ProtoBuilder(OrangeInput* inp,
                            ProtoMap const& protos,
-                           Options&& opts)
+                           Options const& opts)
     : inp_{inp}
     , protos_{protos}
-    , save_json_{std::move(opts.save_json)}
+    , save_json_{opts.save_json}
     , bboxes_{protos_.size()}
 {
     CELER_EXPECT(inp_);

src/orange/orangeinp/detail/ProtoBuilder.hh

@@ -59,7 +59,7 @@ class ProtoBuilder
 
   public:
     // Construct with output pointer, geometry construction options, and protos
-    ProtoBuilder(OrangeInput* inp, ProtoMap const& protos, Options&& opts);
+    ProtoBuilder(OrangeInput* inp, ProtoMap const& protos, Options const& opts);
 
     //! Get the tolerance to use when constructing geometry
     Tol const& tol() const { return inp_->tol; }