Skip to content

Commit c6fef61

Browse files
committed
Resolve conflicts
1 parent 2f71ca7 commit c6fef61

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

rust/Cargo.lock

Lines changed: 0 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/src/nasl/builtin/error.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use thiserror::Error;
66

7-
#[cfg(feature = "nasl-c-lib")]
87
use crate::nasl::builtin::krb5::Krb5Error;
98
use crate::nasl::prelude::*;
109
use crate::nasl::utils::error::FnErrorKind;
@@ -56,7 +55,6 @@ pub enum BuiltinError {
5655
RawIp(RawIpError),
5756
#[error("{0}")]
5857
Preference(String),
59-
#[cfg(feature = "nasl-c-lib")]
6058
#[error("{0}")]
6159
Krb5(Krb5Error),
6260
}
@@ -105,6 +103,4 @@ builtin_error_variant!(SysError, Sys);
105103
builtin_error_variant!(FindServiceError, FindService);
106104
builtin_error_variant!(SnmpError, Snmp);
107105
builtin_error_variant!(RawIpError, RawIp);
108-
109-
#[cfg(feature = "nasl-c-lib")]
110106
builtin_error_variant!(Krb5Error, Krb5);

rust/src/nasl/builtin/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ mod host;
1414
mod http;
1515
mod isotime;
1616
mod knowledge_base;
17-
#[cfg(feature = "nasl-c-lib")]
1817
mod krb5;
1918
pub mod misc;
2019
pub mod network;

0 commit comments

Comments
 (0)