Skip to content

Commit

Permalink
Merge branch 'master' into testable_docs_of_derive_macros
Browse files Browse the repository at this point in the history
  • Loading branch information
dj8yfo authored Dec 28, 2024
2 parents 4561d4f + 73cb83b commit 1fddf16
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
tests:
strategy:
matrix:
rust_version: [1.67.0, stable]
rust_version: [1.67, stable]
runs-on: ubuntu-20.04

steps:
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @frol @dj8yfo
* @frol @dj8yfo @PolyProgrammist @akorchyn
1 change: 1 addition & 0 deletions borsh-derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
feature = "force_exhaustive_checks",
feature(non_exhaustive_omitted_patterns_lint)
)]
#![allow(clippy::needless_lifetimes)]

extern crate proc_macro;
use proc_macro::TokenStream;
Expand Down
2 changes: 1 addition & 1 deletion borsh/src/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub type DiscriminantValue = i64;
/// The name of the field in the struct (can be used to convert JSON to Borsh using the schema).
pub type FieldName = String;
/// The type that we use to represent the definition of the Borsh type.
///
/// Description of data encoding on the wire.
#[derive(Clone, PartialEq, Eq, Debug, BorshSerialize, BorshDeserialize, BorshSchemaMacro)]
pub enum Definition {
Expand Down

0 comments on commit 1fddf16

Please sign in to comment.