Skip to content

Commit

Permalink
Rust: fix a name conflict when building with "no_std" feature (google…
Browse files Browse the repository at this point in the history
…#7268)

* Fix a name conflict when building with "no_std" feature

* Bump patch version
  • Loading branch information
fjarri committed Apr 25, 2022
1 parent c86e6d0 commit 76d3cca
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rust/flatbuffers/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "flatbuffers"
version = "2.1.1"
version = "2.1.2"
edition = "2018"
authors = ["Robert Winslow <[email protected]>", "FlatBuffers Maintainers"]
license = "Apache-2.0"
Expand Down
3 changes: 2 additions & 1 deletion rust/flatbuffers/src/verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use crate::follow::Follow;
use crate::{ForwardsUOffset, SOffsetT, SkipSizePrefix, UOffsetT, VOffsetT, Vector, SIZE_UOFFSET};

#[cfg(feature="no_std")]
extern crate thiserror_core2 as thiserror;
use thiserror_core2::Error;
#[cfg(not(feature="no_std"))]
use thiserror::Error;

/// Traces the location of data errors. Not populated for Dos detecting errors.
Expand Down

0 comments on commit 76d3cca

Please sign in to comment.