Fix rebase

Author: febo

sdk/pinocchio/src/lib.rs

@@ -1,13 +1,16 @@
 //! # Pinocchio
 //!
-//! Pinocchio is a zero-dependency library to create Solana programs in Rust.
-//! It takes advantage of the way SVM loaders serialize the program input parameters
-//! into a byte array that is then passed to the program's entrypoint to define
-//! zero-copy types to read the input - these types are defined in an efficient way
-//! taking into consideration that they will be used in on-chain programs.
+//! Pinocchio is a "no-external" dependencies library to create Solana programs
+//! in Rust, which means that the only dependencies are from the Solana SDK. This
+//! reduces the chance of dependency conflicts when compiling the program.
+//!
+//! It takes advantage of the way SVM loaders serialize the program input
+//! parameters into a byte array that is then passed to the program's entrypoint
+//! to use zero-copy types to read the input - these types are defined in an efficient
+//! way taking into consideration that they will be used in on-chain programs.
 //!
 //! It is intended to be used by on-chain programs only; for off-chain programs,
-//! use instead the [`solana-sdk`] crate.
+//! use instead [`solana-sdk`] crates.
 //!
 //! [`solana-sdk`]: https://docs.rs/solana-sdk/latest/solana_sdk/
 //!
@@ -31,10 +34,10 @@
 //! ```ignore
 //! use pinocchio::{
 //!   AccountView,
+//!   Address,
 //!   entrypoint,
 //!   msg,
-//!   ProgramResult,
-//!   Address
+//!   ProgramResult
 //! };
 //!
 //! entrypoint!(process_instruction);
@@ -71,7 +74,7 @@
 //! ### [`lazy_program_entrypoint!`]
 //!
 //! The [`entrypoint!`] macro looks similar to the "standard" one found in
-//! [`solana-program`](https://docs.rs/solana-program-entrypoint/latest/solana_program_entrypoint/macro.entrypoint.html).
+//! [`solana-program-entrypoint`](https://docs.rs/solana-program-entrypoint/latest/solana_program_entrypoint/macro.entrypoint.html).
 //! It parses the whole input and provides the `program_id`, `accounts` and
 //! `instruction_data` separately. This consumes compute units before the program
 //! begins its execution. In some cases, it is beneficial for a program to have
@@ -137,12 +140,12 @@
 //! ```ignore
 //! use pinocchio::{
 //!   AccountView,
+//!   Address,
 //!   default_panic_handler,
 //!   msg,
 //!   no_allocator,
 //!   program_entrypoint,
-//!   ProgramResult,
-//!   Address
+//!   ProgramResult
 //! };
 //!
 //! program_entrypoint!(process_instruction);
@@ -194,10 +197,10 @@
 //! mod entrypoint {
 //!   use pinocchio::{
 //!     AccountView,
+//!     Address,
 //!     entrypoint,
 //!     msg,
-//!     ProgramResult,
-//!     Address
+//!     ProgramResult
 //!   };
 //!
 //!   entrypoint!(process_instruction);

sdk/pinocchio/src/sysvars/instructions.rs

@@ -244,7 +244,7 @@ impl IntrospectedAccountRole {
 
     /// Convert the `IntrospectedAccountRole` to an `AccountRole`.
     #[inline(always)]
-    pub fn to_account_meta(&self) -> AccountRole {
+    pub fn to_account_role(&self) -> AccountRole {
         AccountRole::new(&self.key, self.is_writable(), self.is_signer())
     }
 }