Commit ec27a636 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rust-fixes-6.5-rc7' of https://github.com/Rust-for-Linux/linux 

Pull rust fix from Miguel Ojeda:

 - Macros: fix 'HAS_*' redefinition by the '#[vtable]' macro
   under conditional compilation

* tag 'rust-fixes-6.5-rc7' of https://github.com/Rust-for-Linux/linux:
  rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
parents 9e6c269d 3fa7187e

rust/macros/vtable.rs

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ pub(crate) fn vtable(_attr: TokenStream, ts: TokenStream) -> TokenStream { 
                const {gen_const_name}: bool = false;",

            )

            .unwrap();

            consts.insert(gen_const_name);

        }

    } else {

        const_items = "const USE_VTABLE_ATTR: () = ();".to_owned();