Skip to content

Commit 358e397

Browse files
authored
Merge pull request #121 from Synicix/unifii-merge
Merge Uniffi and Core together
2 parents d56b4e3 + d3cf4fc commit 358e397

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2803
-2779
lines changed

.clippy.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
excessive-nesting-threshold = 6
21
too-many-arguments-threshold = 10
32
allowed-idents-below-min-chars = ["..", "k", "v", "f", "re", "id", "Ok", "'_"]

.github/actions/build-diagram/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
cargo modules dependencies --lib --max-depth 0 \
1717
--no-uses --no-fns \
1818
--focus-on "
19-
orcapod::uniffi::{
19+
orcapod::{
2020
model::{Pod,PodJob,PodResult},
2121
store::filestore::LocalFileStore,
2222
orchestrator::{PodRun,docker::LocalDockerOrchestrator},

Cargo.toml

Lines changed: 38 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -113,57 +113,44 @@ restriction = "deny"
113113
style = "deny"
114114
suspicious = "deny"
115115

116-
allow_attributes = { level = "allow", priority = 127 } # Useful when suppressing warnings is also desired.
117-
arbitrary_source_item_ordering = { level = "allow", priority = 127 } # allow arbitrary ordering to keep relevant code nearby
118-
arithmetic_side_effects = { level = "allow", priority = 127 } # allow arithmetic for convenience though it could overflow
119-
as_conversions = { level = "allow", priority = 127 } # allow casting
120-
assertions_on_result_states = { level = "allow", priority = 127 } # allow checking is_ok/is_err
121-
big_endian_bytes = { level = "allow", priority = 127 } # allow to_be_bytes / from_be_bytes
122-
blanket_clippy_restriction_lints = { level = "allow", priority = 127 } # allow setting all restrictions so we can omit specific ones
123-
default_numeric_fallback = { level = "allow", priority = 127 } # allow type inferred by numeric literal
124-
disallowed_script_idents = { level = "allow", priority = 127 } # skip since we use only ascii
125-
else_if_without_else = { level = "allow", priority = 127 } # missing else ok
126-
exhaustive_enums = { level = "allow", priority = 127 } # revisit once lib is ready to be used externally
127-
exhaustive_structs = { level = "allow", priority = 127 } # revisit once lib is ready to be used externally
128-
float_arithmetic = { level = "allow", priority = 127 } # allow float arithmetic
129-
host_endian_bytes = { level = "allow", priority = 127 } # allow to_ne_bytes / from_ne_bytes
130-
impl_trait_in_params = { level = "allow", priority = 127 } # impl in params ok
131-
implicit_return = { level = "allow", priority = 127 } # missing return ok
132-
inline_asm_x86_intel_syntax = { level = "allow", priority = 127 } # intel syntax ok
133-
integer_division = { level = "allow", priority = 127 } # allow discarding remainder
134-
iter_over_hash_type = { level = "allow", priority = 127 } # allow iterating over unordered iterables like `HashMap`
135-
little_endian_bytes = { level = "allow", priority = 127 } # allow to_le_bytes / from_le_bytes
136-
missing_asserts_for_indexing = { level = "allow", priority = 127 } # missing assert before indexing ok
137-
missing_docs_in_private_items = { level = "allow", priority = 127 } # missing docs on private ok
138-
missing_inline_in_public_items = { level = "allow", priority = 127 } # let rust compiler determine best inline logic
139-
missing_trait_methods = { level = "allow", priority = 127 } # allow in favor of rustc `implement the missing item`
140-
module_name_repetitions = { level = "allow", priority = 127 } # allow use of module name in type names
141-
multiple_crate_versions = { level = "allow", priority = 127 } # allow since list of exceptions changes frequently from external
142-
multiple_inherent_impl = { level = "allow", priority = 127 } # required in best practice to limit exposure over UniFFI
143-
must_use_candidate = { level = "allow", priority = 127 } # omitting #[must_use] ok
144-
mod_module_files = { level = "allow", priority = 127 } # mod directories ok
145-
non_ascii_literal = { level = "allow", priority = 127 } # non-ascii char in string literal ok
146-
partial_pub_fields = { level = "allow", priority = 127 } # partial struct pub fields ok
147-
pattern_type_mismatch = { level = "allow", priority = 127 } # allow in favor of clippy::ref_patterns
148-
print_stderr = { level = "allow", priority = 127 } # stderr prints ok
149-
print_stdout = { level = "allow", priority = 127 } # stdout prints ok
150-
pub_use = { level = "allow", priority = 127 } # ok to structure source into many files but clean up import
151-
pub_with_shorthand = { level = "allow", priority = 127 } # allow use of pub(super)
152-
pub_without_shorthand = { level = "allow", priority = 127 } # allow use of pub(in super)
153-
question_mark_used = { level = "allow", priority = 127 } # allow question operator
154-
self_named_module_files = { level = "allow", priority = 127 } # mod files ok
155-
semicolon_inside_block = { level = "allow", priority = 127 } # ok to keep inside block
156-
separated_literal_suffix = { level = "allow", priority = 127 } # literal suffixes should be separated by underscore
157-
single_char_lifetime_names = { level = "allow", priority = 127 } # single char lifetimes ok
158-
single_component_path_imports = { level = "allow", priority = 127 } # allow for readability
159-
std_instead_of_alloc = { level = "allow", priority = 127 } # we should use std when possible
160-
std_instead_of_core = { level = "allow", priority = 127 } # we should use std when possible
161-
string_add = { level = "allow", priority = 127 } # simple concat ok
162-
string_lit_chars_any = { level = "allow", priority = 127 } # favor readability until a perf case comes up
163-
use_debug = { level = "warn", priority = 127 } # debug print
164-
wildcard_enum_match_arm = { level = "allow", priority = 127 } # allow wildcard match arm in enums
116+
arbitrary_source_item_ordering = { level = "allow", priority = 127 } # allow arbitrary ordering to keep relevant code nearby
117+
as_conversions = { level = "allow", priority = 127 } # allow casting
118+
blanket_clippy_restriction_lints = { level = "allow", priority = 127 } # allow setting all restrictions so we can omit specific ones
119+
default_numeric_fallback = { level = "allow", priority = 127 } # allow type inferred by numeric literal, detection is buggy
120+
disallowed_script_idents = { level = "allow", priority = 127 } # skip since we use only ascii
121+
exhaustive_enums = { level = "allow", priority = 127 } # remove requirement to label enum as exhaustive
122+
exhaustive_structs = { level = "allow", priority = 127 } # revisit once lib is ready to be used externally
123+
field_scoped_visibility_modifiers = { level = "allow", priority = 127 } # allow field-level visibility modifiers
124+
float_arithmetic = { level = "allow", priority = 127 } # allow float arithmetic
125+
impl_trait_in_params = { level = "allow", priority = 127 } # impl in params ok
126+
implicit_return = { level = "allow", priority = 127 } # missing return ok
127+
iter_over_hash_type = { level = "allow", priority = 127 } # allow iterating over unordered iterables like `HashMap`
128+
little_endian_bytes = { level = "allow", priority = 127 } # allow to_le_bytes / from_le_bytes
129+
missing_docs_in_private_items = { level = "allow", priority = 127 } # missing docs on private ok
130+
missing_inline_in_public_items = { level = "allow", priority = 127 } # let rust compiler determine best inline logic
131+
missing_trait_methods = { level = "allow", priority = 127 } # allow in favor of rustc `implement the missing item`
132+
module_name_repetitions = { level = "allow", priority = 127 } # allow use of module name in type names
133+
multiple_crate_versions = { level = "allow", priority = 127 } # allow since list of exceptions changes frequently from external
134+
multiple_inherent_impl = { level = "allow", priority = 127 } # required in best practice to limit exposure over UniFFI
135+
must_use_candidate = { level = "allow", priority = 127 } # omitting #[must_use] ok
136+
mod_module_files = { level = "allow", priority = 127 } # mod directories ok
137+
non_ascii_literal = { level = "allow", priority = 127 } # non-ascii char in string literal ok
138+
partial_pub_fields = { level = "allow", priority = 127 } # partial struct pub fields ok
139+
pattern_type_mismatch = { level = "allow", priority = 127 } # allow in favor of clippy::ref_patterns
140+
print_stderr = { level = "allow", priority = 127 } # stderr prints ok
141+
print_stdout = { level = "allow", priority = 127 } # stdout prints ok
142+
pub_use = { level = "allow", priority = 127 } # ok to structure source into many files but clean up import
143+
pub_with_shorthand = { level = "allow", priority = 127 } # allow use of pub(super)
144+
question_mark_used = { level = "allow", priority = 127 } # allow question operator
145+
self_named_module_files = { level = "allow", priority = 127 } # mod files ok
146+
separated_literal_suffix = { level = "allow", priority = 127 } # literal suffixes should be separated by underscore
147+
single_call_fn = { level = "allow", priority = 127 } # allow functions called only once, which allows better code organization
148+
single_char_lifetime_names = { level = "allow", priority = 127 } # single char lifetimes ok
149+
std_instead_of_alloc = { level = "allow", priority = 127 } # we should use std when possible
150+
std_instead_of_core = { level = "allow", priority = 127 } # we should use std when possible
151+
string_add = { level = "allow", priority = 127 } # simple concat ok
152+
use_debug = { level = "warn", priority = 127 } # debug print
153+
wildcard_enum_match_arm = { level = "allow", priority = 127 } # allow wildcard match arm in enums
165154

166155
# temporary
167-
single_call_fn = { level = "allow", priority = 127 } # remove once more models need pointer serializers/deserializers
168156
tests_outside_test_module = { level = "allow", priority = 127 } # for now due to false-positive for integration tests: https://github.com/rust-lang/rust-clippy/pull/13038
169-
todo = { level = "allow", priority = 127 } # allow while we are working towards MVP release

src/bin/uniffi-bindgen.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//! `uniffi` CLI to generate client bindings e.g. for Python.
2-
use uniffi;
32
43
fn main() {
54
uniffi::uniffi_bindgen_main();

src/core/error.rs

Lines changed: 0 additions & 154 deletions
This file was deleted.

src/core/mod.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)