aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nix-rust/src/lib.rs11
-rw-r--r--nix-rust/src/store/path.rs1
-rw-r--r--nix-rust/src/util/base32.rs3
-rw-r--r--src/libexpr/attr-set.hh6
-rw-r--r--src/libstore/path.hh2
-rw-r--r--src/libutil/rust-ffi.hh2
-rw-r--r--src/nix/why-depends.cc4
7 files changed, 13 insertions, 16 deletions
diff --git a/nix-rust/src/lib.rs b/nix-rust/src/lib.rs
index e62613ba8..27ea69fbd 100644
--- a/nix-rust/src/lib.rs
+++ b/nix-rust/src/lib.rs
@@ -1,14 +1,3 @@
-#[macro_use]
-extern crate lazy_static;
-
-#[cfg(test)]
-#[macro_use]
-extern crate assert_matches;
-
-#[cfg(test)]
-#[macro_use]
-extern crate proptest;
-
#[cfg(not(test))]
mod c;
mod error;
diff --git a/nix-rust/src/store/path.rs b/nix-rust/src/store/path.rs
index 2a5170bef..47b5975c0 100644
--- a/nix-rust/src/store/path.rs
+++ b/nix-rust/src/store/path.rs
@@ -138,6 +138,7 @@ impl fmt::Display for StorePathName {
#[cfg(test)]
mod tests {
use super::*;
+ use assert_matches::assert_matches;
#[test]
fn test_parse() {
diff --git a/nix-rust/src/util/base32.rs b/nix-rust/src/util/base32.rs
index ba7368933..efd4a2901 100644
--- a/nix-rust/src/util/base32.rs
+++ b/nix-rust/src/util/base32.rs
@@ -1,4 +1,5 @@
use crate::error::Error;
+use lazy_static::lazy_static;
pub fn encoded_len(input_len: usize) -> usize {
if input_len == 0 {
@@ -87,7 +88,9 @@ pub fn decode(input: &str) -> Result<Vec<u8>, crate::Error> {
#[cfg(test)]
mod tests {
use super::*;
+ use assert_matches::assert_matches;
use hex;
+ use proptest::proptest;
#[test]
fn test_encode() {
diff --git a/src/libexpr/attr-set.hh b/src/libexpr/attr-set.hh
index d6af99912..118c7bd5d 100644
--- a/src/libexpr/attr-set.hh
+++ b/src/libexpr/attr-set.hh
@@ -64,12 +64,12 @@ public:
return end();
}
- std::optional<Attr *> get(const Symbol & name)
+ Attr * get(const Symbol & name)
{
Attr key(name, 0);
iterator i = std::lower_bound(begin(), end(), key);
if (i != end() && i->name == name) return &*i;
- return {};
+ return nullptr;
}
Attr & need(const Symbol & name, const Pos & pos = noPos)
@@ -77,7 +77,7 @@ public:
auto a = get(name);
if (!a)
throw Error("attribute '%s' missing, at %s", name, pos);
- return **a;
+ return *a;
}
iterator begin() { return &attrs[0]; }
diff --git a/src/libstore/path.hh b/src/libstore/path.hh
index c31ea2179..c90bb1fff 100644
--- a/src/libstore/path.hh
+++ b/src/libstore/path.hh
@@ -18,6 +18,8 @@ extern "C" {
struct StorePath : rust::Value<3 * sizeof(void *) + 24, ffi_StorePath_drop>
{
+ StorePath() = delete;
+
static StorePath make(std::string_view path, std::string_view storeDir);
static StorePath make(unsigned char hash[20], std::string_view name);
diff --git a/src/libutil/rust-ffi.hh b/src/libutil/rust-ffi.hh
index 469a5fba3..228e2eead 100644
--- a/src/libutil/rust-ffi.hh
+++ b/src/libutil/rust-ffi.hh
@@ -113,6 +113,8 @@ extern "C" {
struct String : Vec<char, ffi_String_drop>
{
+ String() = delete;
+
String(std::string_view s)
{
ffi_String_new(StringSlice(s), this);
diff --git a/src/nix/why-depends.cc b/src/nix/why-depends.cc
index 900466538..a9a5ec8f8 100644
--- a/src/nix/why-depends.cc
+++ b/src/nix/why-depends.cc
@@ -103,7 +103,7 @@ struct CmdWhyDepends : SourceExprCommand
std::map<StorePath, Node> graph;
for (auto & path : closure)
- graph.emplace(path.clone(), Node{path.clone(), cloneStorePathSet(store->queryPathInfo(path)->references)});
+ graph.emplace(path.clone(), Node { .path = path.clone(), .refs = cloneStorePathSet(store->queryPathInfo(path)->references) });
// Transpose the graph.
for (auto & node : graph)
@@ -112,7 +112,7 @@ struct CmdWhyDepends : SourceExprCommand
/* Run Dijkstra's shortest path algorithm to get the distance
of every path in the closure to 'dependency'. */
- graph[dependencyPath.clone()].dist = 0;
+ graph.emplace(dependencyPath.clone(), Node { .path = dependencyPath.clone(), .dist = 0 });
std::priority_queue<Node *> queue;