Skip to content

Commit 8d9b982

Browse files
bors[bot]Bromeon
bors[bot]
and
Bromeon
authored
Merge #835
835: Qualify identifiers in proc-macros, avoids potential naming conflicts r=Bromeon a=Bromeon Fixes #834. Co-authored-by: Jan Haller <[email protected]>
2 parents 5ebdbc8 + 39623f4 commit 8d9b982

File tree

7 files changed

+22
-23
lines changed

7 files changed

+22
-23
lines changed

‎bindings_generator/src/methods.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ pub fn generate_method_table(api: &Api, class: &GodotClass) -> TokenStream {
218218
pub fn get(gd_api: &GodotApi) -> &'static Self {
219219
unsafe {
220220
let table = Self::get_mut();
221-
static INIT: ::std::sync::Once = Once::new();
221+
static INIT: std::sync::Once = std::sync::Once::new();
222222
INIT.call_once(|| {
223223
#method_table::init(table, gd_api);
224224
});
@@ -618,7 +618,7 @@ mod varargs_call {
618618
let arg_count = sig.arguments.len();
619619
let method_body = {
620620
let args_buffer = quote! {
621-
let mut argument_buffer: Vec<*const sys::godot_variant> = Vec::with_capacity(#arg_count + varargs.len());
621+
let mut argument_buffer: std::vec::Vec<*const sys::godot_variant> = std::vec::Vec::with_capacity(#arg_count + varargs.len());
622622
};
623623

624624
let args = arguments.clone().map(|(name, ty)| {

‎gdnative-bindings/src/generated.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use libc;
44
use libc::c_char;
55
use std::mem;
66
use std::ptr;
7-
use std::sync::Once;
87

98
use gdnative_core::core_types::*;
109
use gdnative_core::object::*;

‎gdnative-derive/src/varargs.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pub(crate) fn derive_from_varargs(input: DeriveInput) -> Result<TokenStream2, sy
3838
impl #generics ::gdnative::export::FromVarargs for #ident #generics #where_clause {
3939
fn read<'a>(
4040
#input_ident: &mut ::gdnative::export::Varargs<'a>,
41-
) -> Result<Self, Vec<::gdnative::export::ArgumentError<'a>>> {
42-
Ok(#ident)
41+
) -> std::result::Result<Self, std::vec::Vec<::gdnative::export::ArgumentError<'a>>> {
42+
std::result::Result::Ok(#ident)
4343
}
4444
}
4545
})
@@ -116,8 +116,8 @@ pub(crate) fn derive_from_varargs(input: DeriveInput) -> Result<TokenStream2, sy
116116
impl #generics ::gdnative::export::FromVarargs for #ident #generics #where_clause {
117117
fn read<'a>(
118118
#input_ident: &mut ::gdnative::export::Varargs<'a>,
119-
) -> Result<Self, Vec<::gdnative::export::ArgumentError<'a>>> {
120-
let mut __errors = Vec::new();
119+
) -> std::result::Result<Self,std::vec:: Vec<::gdnative::export::ArgumentError<'a>>> {
120+
let mut __errors = std::vec::Vec::new();
121121

122122
#(
123123
let #req_var_idents = #input_ident.read()
@@ -140,14 +140,14 @@ pub(crate) fn derive_from_varargs(input: DeriveInput) -> Result<TokenStream2, sy
140140
)*
141141

142142
if !__errors.is_empty() {
143-
return Err(__errors);
143+
return std::result::Result::Err(__errors);
144144
}
145145

146146
#(
147147
let #req_var_idents = #req_var_idents.unwrap();
148148
)*
149149

150-
Ok(#ident {
150+
std::result::Result::Ok(#ident {
151151
#(#req_var_idents,)*
152152
#(#opt_var_idents,)*
153153
})

‎gdnative-derive/src/variant/from.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ pub(crate) fn expand_from_variant(derive_data: DeriveData) -> Result<TokenStream
6565
let __dict = ::gdnative::core_types::Dictionary::from_variant(#input_ident)
6666
.map_err(|__err| FVE::InvalidEnumRepr {
6767
expected: VariantEnumRepr::ExternallyTagged,
68-
error: Box::new(__err),
68+
error: std::boxed::Box::new(__err),
6969
})?;
7070

7171
let __keys = __dict.keys();
7272
if __keys.len() != 1 {
7373
Err(FVE::InvalidEnumRepr {
7474
expected: VariantEnumRepr::ExternallyTagged,
75-
error: Box::new(FVE::InvalidLength {
75+
error: std::boxed::Box::new(FVE::InvalidLength {
7676
expected: 1,
7777
len: __keys.len() as usize,
7878
}),
@@ -82,15 +82,15 @@ pub(crate) fn expand_from_variant(derive_data: DeriveData) -> Result<TokenStream
8282
let __key = String::from_variant(&__keys.get(0))
8383
.map_err(|__err| FVE::InvalidEnumRepr {
8484
expected: VariantEnumRepr::ExternallyTagged,
85-
error: Box::new(__err),
85+
error: std::boxed::Box::new(__err),
8686
})?;
8787
match __key.as_str() {
8888
#(
8989
#ref_var_ident_string_literals => {
9090
let #var_input_ident_iter = &__dict.get_or_nil(&__keys.get(0));
9191
(#var_from_variants).map_err(|err| FVE::InvalidEnumVariant {
9292
variant: #ref_var_ident_string_literals,
93-
error: Box::new(err),
93+
error: std::boxed::Box::new(err),
9494
})
9595
},
9696
)*

‎gdnative-derive/src/variant/repr.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ impl VariantRepr {
231231
::gdnative::core_types::VariantArray::from_variant(#variant)
232232
.map_err(|__err| FVE::InvalidStructRepr {
233233
expected: VariantStructRepr::Tuple,
234-
error: Box::new(__err),
234+
error: std::boxed::Box::new(__err),
235235
})
236236
.and_then(|__array| {
237237
let __expected = #expected_len;
@@ -245,11 +245,11 @@ impl VariantRepr {
245245
let #non_skipped_idents = #non_skipped_exprs
246246
.map_err(|err| FVE::InvalidItem {
247247
index: __index as usize,
248-
error: Box::new(err),
248+
error: std::boxed::Box::new(err),
249249
})?;
250250
)*
251251
#(
252-
let #skipped_idents = ::std::default::Default::default();
252+
let #skipped_idents = std::default::Default::default();
253253
)*
254254
Ok(#ctor( #(#ctor_idents),* ))
255255
}
@@ -290,7 +290,7 @@ impl VariantRepr {
290290
::gdnative::core_types::Dictionary::from_variant(#variant)
291291
.map_err(|__err| FVE::InvalidStructRepr {
292292
expected: VariantStructRepr::Struct,
293-
error: Box::new(__err),
293+
error: std::boxed::Box::new(__err),
294294
})
295295
.and_then(|__dict| {
296296
#(
@@ -299,11 +299,11 @@ impl VariantRepr {
299299
let #non_skipped_idents = #exprs
300300
.map_err(|err| FVE::InvalidField {
301301
field_name: __field_name,
302-
error: Box::new(err),
302+
error: std::boxed::Box::new(err),
303303
})?;
304304
)*
305305
#(
306-
let #skipped_idents = ::std::default::Default::default();
306+
let #skipped_idents = std::default::Default::default();
307307
)*
308308
Ok(#ctor { #( #ctor_idents ),* })
309309
})

‎gdnative-sys/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,10 +523,10 @@ mod api_wrapper {
523523
}
524524
}
525525
quote! {
526-
pub unsafe fn from_raw(core_api_struct: *const godot_gdnative_core_api_struct) -> Result<Self, InitError> {
526+
pub unsafe fn from_raw(core_api_struct: *const godot_gdnative_core_api_struct) -> std::result::Result<Self, InitError> {
527527
#godot_apis
528528
#struct_field_bindings
529-
Ok(GodotApi{
529+
std::result::Result::Ok(GodotApi{
530530
#constructed_struct_fields
531531
})
532532
}

‎impl/proc_macros/src/pool_array_element.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,13 +390,13 @@ pub fn decl_element(input: proc_macro::TokenStream) -> Result<TokenStream, syn::
390390
#(#attrs)*
391391
pub trait #trait_name: private::Sealed {
392392
#[doc(hidden)]
393-
type SysArray: Default;
393+
type SysArray: std::default::Default;
394394
#[doc(hidden)]
395395
type SysReadAccess;
396396
#[doc(hidden)]
397397
type SysWriteAccess;
398398
#[doc(hidden)]
399-
type SysTy: Default;
399+
type SysTy: std::default::Default;
400400
#[doc(hidden)]
401401
type SysRefTy;
402402

0 commit comments

Comments
 (0)