Merge branch 'v0.1' into 'v0.2'

Cryptjar · Apr 2, 2022 · 1ebc117 · 1ebc117
2 parents aa33902 + 5065cb3
commit 1ebc117
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -2,10 +2,9 @@
 #![no_std]
 //
 // We need inline assembly for the `lpm` instruction.
-#![feature(llvm_asm)]
-//
-// For string support, we need to convert from slice to array in const context.
-#![feature(const_raw_ptr_deref)]
+// However, it seems in more recent Rust version there is no more `llvm_asm`.
+// And docs.rs uses the latest Rust version.
+#![cfg_attr(not(doc), feature(llvm_asm))]
 
 //!
 //! Progmem utilities for the AVR architectures.

diff --git a/src/raw.rs b/src/raw.rs
@@ -50,7 +50,7 @@ use cfg_if::cfg_if;
 ///
 pub unsafe fn read_byte(p_addr: *const u8) -> u8 {
 	cfg_if! {
-		if #[cfg(target_arch = "avr")] {
+		if #[cfg(all(target_arch = "avr", not(doc)))] {
 			// Only addresses below the 64 KiB limit are supported!
 			// Apparently this is of no concern for architectures with true
 			// 16-bit pointers.
@@ -187,7 +187,7 @@ unsafe fn read_asm_loop_raw<T>(p_addr: *const T, out: *mut T, len: u8) {
 
 
 	cfg_if! {
-		if #[cfg(target_arch = "avr")] {
+		if #[cfg(all(target_arch = "avr", not(doc)))] {
 			// Only addresses below the 64 KiB limit are supported
 			// Apparently this is of no concern for architectures with true
 			// 16-bit pointers.