Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes clippy for consumers #256

Merged
merged 1 commit into from
Aug 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/todolist/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl TodoList {
if self.items.contains(&item) {
return Err(TodoError::DuplicateTodo);
}
self.items.push(item.into());
self.items.push(item);
Ok(())
}

Expand Down
14 changes: 5 additions & 9 deletions uniffi_bindgen/src/interface/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

//#![deny(missing_docs)]
#![allow(unknown_lints)]
#![warn(rust_2018_idioms)]

//! # Component Interface Definition and Types
//!
//! This crate provides an abstract representation of the interface provided by a uniffi rust component,
Expand Down Expand Up @@ -967,7 +963,7 @@ impl Attribute {
impl TryFrom<&weedle::attribute::ExtendedAttribute<'_>> for Attribute {
type Error = anyhow::Error;
fn try_from(
weedle_attribute: &weedle::attribute::ExtendedAttribute,
weedle_attribute: &weedle::attribute::ExtendedAttribute<'_>,
) -> Result<Self, anyhow::Error> {
match weedle_attribute {
weedle::attribute::ExtendedAttribute::NoArgs(attr) => match (attr.0).0 {
Expand Down Expand Up @@ -1005,7 +1001,7 @@ pub struct Attributes(Vec<Attribute>);

impl Attributes {
pub fn contains_error_attr(&self) -> bool {
self.0.iter().find(|attr| attr.is_error()).is_some()
self.0.iter().any(|attr| attr.is_error())
}

fn get_throws_err(&self) -> Option<&str> {
Expand All @@ -1021,7 +1017,7 @@ impl Attributes {
impl TryFrom<&weedle::attribute::ExtendedAttributeList<'_>> for Attributes {
type Error = anyhow::Error;
fn try_from(
weedle_attributes: &weedle::attribute::ExtendedAttributeList,
weedle_attributes: &weedle::attribute::ExtendedAttributeList<'_>,
) -> Result<Self, Self::Error> {
let attrs = &weedle_attributes.body.list;

Expand All @@ -1034,9 +1030,9 @@ impl TryFrom<&weedle::attribute::ExtendedAttributeList<'_>> for Attributes {

attrs
.iter()
.map(|attr| Attribute::try_from(attr))
.map(Attribute::try_from)
.collect::<Result<Vec<_>, _>>()
.map(|attrs| Attributes(attrs))
.map(Attributes)
}
}

Expand Down
4 changes: 0 additions & 4 deletions uniffi_bindgen/src/interface/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

//#![deny(missing_docs)]
#![allow(unknown_lints)]
#![warn(rust_2018_idioms)]

//! # Basic typesystem for defining a component interface.
//!
//! Our typesystem operates at two distinct levels: "API-level types" and "FFI-level types".
Expand Down
3 changes: 3 additions & 0 deletions uniffi_bindgen/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@
//! to load and use the compiled rust code via its C-compatible FFI.
//!

#![warn(rust_2018_idioms)]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The compiler started telling me that the #![warn(rust_2018_idioms)] is ignored if it's not at the crate level, so I moved those here

#![allow(unknown_lints)]

const BINDGEN_VERSION: &str = env!("CARGO_PKG_VERSION");

use anyhow::{anyhow, bail, Result};
Expand Down
3 changes: 2 additions & 1 deletion uniffi_bindgen/src/templates/ObjectTemplate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ uniffi::deps::lazy_static::lazy_static! {
}

{%- for cons in obj.constructors() %}

#[allow(clippy::all)]
#[no_mangle]
pub extern "C" fn {{ cons.ffi_func().name() }}(
{%- call rs::arg_list_ffi_decl(cons.ffi_func()) %}) -> u64 {
Expand All @@ -30,6 +30,7 @@ uniffi::deps::lazy_static::lazy_static! {
{%- endfor %}

{%- for meth in obj.methods() %}
#[allow(clippy::all)]
#[no_mangle]
pub extern "C" fn {{ meth.ffi_func().name() }}(
{%- call rs::arg_list_ffi_decl(meth.ffi_func()) %}
Expand Down
6 changes: 5 additions & 1 deletion uniffi_bindgen/src/templates/RustString.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Everybody gets basic string support, since they're such a common data type.

/// # Safety
/// This helper receives a borrowed foreign language string and
/// copies it into an owned rust string. It is naturally tremendously unsafe,
/// because pointers. The main things to remember as a consumer are:
Expand Down Expand Up @@ -29,9 +30,12 @@ pub unsafe extern "C" fn {{ ci.ffi_string_alloc_from().name() }}(cstr: *const st
}

/// Free a String that had previously been passed to the foreign language code.
///
/// # Safety
/// In order to free the string, Rust takes ownership of a raw pointer
/// which is an unsafe operation.
/// The argument *must* be a uniquely-owned pointer previously obtained from a call
/// into the rust code that returned a string.
///
#[no_mangle]
pub unsafe extern "C" fn {{ ci.ffi_string_free().name() }}(cstr: *mut std::os::raw::c_char) {
// We deliberately don't check the `Result` here, so that callers don't need to pass an out `err`.
Expand Down
2 changes: 1 addition & 1 deletion uniffi_bindgen/src/templates/TopLevelFunctionTemplate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// send data across the FFI, which will fail to compile if the provided function does not match what's
// specified in the IDL.
#}

#[allow(clippy::all)]
#[no_mangle]
pub extern "C" fn {{ func.ffi_func().name() }}(
{% call rs::arg_list_ffi_decl(func.ffi_func()) %}
Expand Down