Skip to content

Commit 48a5e2d

Browse files
committed
EvalState: add doc comment
1 parent 6db8638 commit 48a5e2d

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

src/libexpr/include/nix/expr/eval.hh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,15 @@ private:
508508

509509
public:
510510

511+
/**
512+
* @param lookupPath Only used during construction.
513+
* @param store The store to use for instantiation
514+
* @param fetchSettings Must outlive the lifetime of this EvalState!
515+
* @param settings Must outlive the lifetime of this EvalState!
516+
* @param buildStore The store to use for builds ("import from derivation", C API `nix_string_realise`)
517+
*/
511518
EvalState(
512-
const LookupPath & _lookupPath,
519+
const LookupPath & lookupPath,
513520
ref<Store> store,
514521
const fetchers::Settings & fetchSettings,
515522
const EvalSettings & settings,

src/libutil/include/nix/util/error.hh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,9 @@ public:
193193
}
194194

195195
/**
196-
* @param pos Nullable `shared_ptr<Pos>`
196+
* Prepends an item to the error trace, as is usual for extra context.
197+
*
198+
* @param pos Nullable source position to put in trace item
197199
* @param fs Format string, see `HintFmt`
198200
* @param args... Format string arguments.
199201
*/
@@ -204,9 +206,11 @@ public:
204206
}
205207

206208
/**
207-
* @param pos Nullable `shared_ptr<Pos>`
209+
* Prepends an item to the error trace, as is usual for extra context.
210+
*
211+
* @param pos Nullable source position to put in trace item
208212
* @param hint Formatted error message
209-
* @param print Optional, whether to always print (e.g. `addErrorContext`)
213+
* @param print Optional, whether to always print (used by `addErrorContext`)
210214
*/
211215
void addTrace(std::shared_ptr<const Pos> && pos, HintFmt hint, TracePrint print = TracePrint::Default);
212216

0 commit comments

Comments
 (0)