html-to-markdown 2.27.2 → 2.28.0

data/rust-vendor/html-to-markdown-rs/tests/issue_216_217_regressions.rs

@@ -0,0 +1,82 @@
+//! Regression tests for issues #216 and #217.
+//!
+//! Both issues report a panic at text_node.rs:191:
+//! "byte index N is out of bounds of ``"
+//!
+//! Root cause: When inline handlers (strong, em, etc.) collect children into a
+//! fresh String buffer while inheriting a parent context with block_content_start
+//! set by a paragraph handler, the index points into the wrong buffer.
+
+use html_to_markdown_rs::convert;
+
+/// Minimal reproducer: a <details> containing a <p> with <strong> inside.
+/// The <details> handler collects into a fresh buffer, the <p> sets
+/// block_content_start, and the <strong> handler creates yet another fresh
+/// buffer — causing the index to be out of bounds.
+#[test]
+fn test_issue_216_217_details_paragraph_strong_no_panic() {
+    let html = r#"
+    <div>some preceding content</div>
+    <details>
+        <summary>Summary text</summary>
+        <p><strong>Bold text inside details paragraph
+</strong></p>
+    </details>
+    "#;
+
+    let result = convert(html, None);
+    assert!(result.is_ok());
+}
+
+/// Same issue can occur with emphasis inside a paragraph inside details.
+#[test]
+fn test_issue_216_217_details_paragraph_em_no_panic() {
+    let html = r#"
+    <div>some preceding content</div>
+    <details>
+        <summary>Summary</summary>
+        <p><em>Italic text inside details paragraph
+</em></p>
+    </details>
+    "#;
+
+    let result = convert(html, None);
+    assert!(result.is_ok());
+}
+
+/// The panic can also occur with nested inline elements inside paragraphs
+/// collected by any handler that creates a fresh buffer.
+#[test]
+fn test_issue_216_217_nested_strong_in_paragraph_no_panic() {
+    let html = r#"
+    <details>
+        <p>Some text <strong>bold text with trailing newline
+</strong> more text</p>
+    </details>
+    "#;
+
+    let result = convert(html, None);
+    assert!(result.is_ok());
+}
+
+/// Test with the actual structure pattern from the reported URL.
+#[test]
+fn test_issue_216_217_complex_details_structure() {
+    let html = r#"
+    <div class="content">
+        <section>
+            <details>
+                <summary>Stratégie adaptation</summary>
+                <p><strong>Risque élevé pour les populations
+</strong></p>
+                <p>Description du risque avec des détails supplémentaires.</p>
+            </details>
+        </section>
+    </div>
+    "#;
+
+    let result = convert(html, None);
+    assert!(result.is_ok());
+    let md = result.unwrap();
+    assert!(md.contains("Risque"));
+}

data/rust-vendor/quote/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"94333ca7e9823d07e8a4d248b0f8c943aaa0bcc0fdaf5b37b5306c921b9c81ab",".github/FUNDING.yml":"b017158736b3c9751a2d21edfce7fe61c8954e2fced8da8dd3013c2f3e295bd9",".github/workflows/ci.yml":"b04aabb8eb8ecc7b9b443280fe51489df7fb450e327ee459a19e727c86793690","Cargo.lock":"44bd3ed7bd105a5c29ec4e585308c3d29a5e6d11e069ece44a5abe8e869e116d","Cargo.toml":"0eb3904bf712f0a2b4501057f0b4206ba5d3ecd31ff5c7708a5407164ee13657","Cargo.toml.orig":"39867fc2710eeff590ed41e0907591b0f2edf10f41c6897c0a21f554c91d4575","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"5bc59a97099fbdc7f9f8b69d3f9910e27629184647412b5009b274b5b8bfb6d1","build.rs":"cd6808c02e476b09a520105e2c6f6d325cccb1ecd542cbbcc836a0ae6f6fb0f1","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/ext.rs":"dabcf1dbf9a81c2dccbfb85f81a08120f5a15be40616d51434ed4ebdfe0c7283","src/format.rs":"662db1f14106d79aacab400a3176a75989a4437ecaaa85ab88cd9a40b750cc5b","src/ident_fragment.rs":"eed1a7407182c00ddfdc98741eaa6e234a6d2c01755e95f943b27926b8c92243","src/lib.rs":"3647fe365bb87f0199dacc3bb39644335d49375c7c019305a90cb9953e3e32e1","src/runtime.rs":"fdb7986b31141627408b51381607f66ef4b69dd81b080c2f6489da267e96b2ba","src/spanned.rs":"713678bf5cb3b4bf2f119dcf64d188a63dc59455a724c3d2567ceab83b734d73","src/to_tokens.rs":"0d0a70923bf91ee43a4361dd3b6cd2ac52ceba736289a200b189769b8fc8c810","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/test.rs":"023d6b57ba5ba199a04d9757e3b1464c2bc09579b035ea82c047e08d89d19226","tests/ui/does-not-have-iter-interpolated-dup.rs":"ad13eea21d4cdd2ab6c082f633392e1ff20fb0d1af5f2177041e0bf7f30da695","tests/ui/does-not-have-iter-interpolated-dup.stderr":"d076d9581ce9f684dcf51aadcf77c206a8a1d3c6774cee14e5d40339ea3ebe07","tests/ui/does-not-have-iter-interpolated.rs":"83a5b3f240651adcbe4b6e51076d76d653ad439b37442cf4054f1fd3c073f3b7","tests/ui/does-not-have-iter-interpolated.stderr":"5b611cd647c162f9d5b52d8c3eb8ed50bd1d7d325671aaf85815d7420e867169","tests/ui/does-not-have-iter-separated.rs":"fe413c48331d5e3a7ae5fef6a5892a90c72f610d54595879eb49d0a94154ba3f","tests/ui/does-not-have-iter-separated.stderr":"43fe592afacc052da2d0c9525bf7160fd4a80effa0949e83fe6291b8d6257dcb","tests/ui/does-not-have-iter.rs":"09dc9499d861b63cebb0848b855b78e2dc9497bfde37ba6339f3625ae009a62f","tests/ui/does-not-have-iter.stderr":"ccd8fb640776402f7fc980be05df5f998b9557f67a0d5d2ab89f2f7b6bd0731a","tests/ui/not-quotable.rs":"5759d0884943417609f28faadc70254a3e2fd3d9bd6ff7297a3fb70a77fafd8a","tests/ui/not-quotable.stderr":"433a290bd53070d5cce6d623f9ef6f991756a78de109d3e486b46b699c2ce764","tests/ui/not-repeatable.rs":"a4b115c04e4e41049a05f5b69450503fbffeba031218b4189cb931839f7f9a9c","tests/ui/not-repeatable.stderr":"095da8ad7db595241a5df7615134d8dc07d607d9bad5fb8d9b771e6bae967c9c","tests/ui/wrong-type-span.rs":"6195e35ea844c0c52ba1cff5d790c3a371af6915d137d377834ad984229ef9ea","tests/ui/wrong-type-span.stderr":"cad072e40e0ecc04f375122ae41aede2f0da2a9244492b3fcf70249e59d1b128"},"package":"21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"}
+{"files":{".cargo_vcs_info.json":"028423ae25f8c28e13cd05257f322bf8db75a4cc42dc24c6d270c47638531281",".github/FUNDING.yml":"b017158736b3c9751a2d21edfce7fe61c8954e2fced8da8dd3013c2f3e295bd9",".github/workflows/ci.yml":"4a8b66b436e23d9078bcf67e652cce0e5bca4129090e8aca1a421f17ba7335ea","Cargo.lock":"c26858e11fd8b6a1ce3f879d5121f558f9e6d614a47341955ac600bfea2394e8","Cargo.toml":"baa198cfd5e82e453e6b8d9bd5435b7a79289edf86f276fc578ee726d39cc870","Cargo.toml.orig":"b6045edc8ab83292438f5651a40949b74d1d85298e523c6f3d8eaeb5f00dbf3a","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"9d6af721967088b8263c0544c0c3c459206998252dd5632a3bdf87cb27ec92be","build.rs":"cd6808c02e476b09a520105e2c6f6d325cccb1ecd542cbbcc836a0ae6f6fb0f1","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/ext.rs":"dabcf1dbf9a81c2dccbfb85f81a08120f5a15be40616d51434ed4ebdfe0c7283","src/format.rs":"662db1f14106d79aacab400a3176a75989a4437ecaaa85ab88cd9a40b750cc5b","src/ident_fragment.rs":"eed1a7407182c00ddfdc98741eaa6e234a6d2c01755e95f943b27926b8c92243","src/lib.rs":"7cd707302e0915ae8fa9e295fa154eea80a592fac9e85a857f22f3a82442dcc3","src/runtime.rs":"fdb7986b31141627408b51381607f66ef4b69dd81b080c2f6489da267e96b2ba","src/spanned.rs":"713678bf5cb3b4bf2f119dcf64d188a63dc59455a724c3d2567ceab83b734d73","src/to_tokens.rs":"84c81c39c8443d116d031208abcca9f8482b8abf7bde3ee6723b7f987c10b2fd","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/test.rs":"023d6b57ba5ba199a04d9757e3b1464c2bc09579b035ea82c047e08d89d19226","tests/ui/does-not-have-iter-interpolated-dup.rs":"ad13eea21d4cdd2ab6c082f633392e1ff20fb0d1af5f2177041e0bf7f30da695","tests/ui/does-not-have-iter-interpolated-dup.stderr":"d076d9581ce9f684dcf51aadcf77c206a8a1d3c6774cee14e5d40339ea3ebe07","tests/ui/does-not-have-iter-interpolated.rs":"83a5b3f240651adcbe4b6e51076d76d653ad439b37442cf4054f1fd3c073f3b7","tests/ui/does-not-have-iter-interpolated.stderr":"5b611cd647c162f9d5b52d8c3eb8ed50bd1d7d325671aaf85815d7420e867169","tests/ui/does-not-have-iter-separated.rs":"fe413c48331d5e3a7ae5fef6a5892a90c72f610d54595879eb49d0a94154ba3f","tests/ui/does-not-have-iter-separated.stderr":"43fe592afacc052da2d0c9525bf7160fd4a80effa0949e83fe6291b8d6257dcb","tests/ui/does-not-have-iter.rs":"09dc9499d861b63cebb0848b855b78e2dc9497bfde37ba6339f3625ae009a62f","tests/ui/does-not-have-iter.stderr":"ccd8fb640776402f7fc980be05df5f998b9557f67a0d5d2ab89f2f7b6bd0731a","tests/ui/not-quotable.rs":"5759d0884943417609f28faadc70254a3e2fd3d9bd6ff7297a3fb70a77fafd8a","tests/ui/not-quotable.stderr":"a9748bc9a0a72a17f9c1f96e9b12be3686e9d7d51f120796516e26e5cebf62ad","tests/ui/not-repeatable.rs":"a4b115c04e4e41049a05f5b69450503fbffeba031218b4189cb931839f7f9a9c","tests/ui/not-repeatable.stderr":"72105d3dec4e8ed2a657db7d397e30d452c26c1488cb1e18e23c2d1d137a6f6d","tests/ui/wrong-type-span.rs":"6195e35ea844c0c52ba1cff5d790c3a371af6915d137d377834ad984229ef9ea","tests/ui/wrong-type-span.stderr":"cad072e40e0ecc04f375122ae41aede2f0da2a9244492b3fcf70249e59d1b128"},"package":"41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"}

data/rust-vendor/quote/.cargo_vcs_info.json

@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "ad9fb4019efc3f34e5d3b9be416199937f7a8ee3"
+    "sha1": "842ffde933fdd76cd1681a288bed136d8b95a97a"
   },
   "path_in_vcs": ""
 }

data/rust-vendor/quote/.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, stable, beta, 1.83.0, 1.68.0]
+        rust: [nightly, stable, beta, 1.83.0, 1.71.0]
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v6
@@ -37,7 +37,7 @@ jobs:
         if: matrix.rust == 'nightly'
       - run: cargo check
       - run: cargo test
-        if: matrix.rust != '1.68.0'
+        if: matrix.rust != '1.71.0'
       - run: cargo run --manifest-path benches/Cargo.toml
       - uses: actions/upload-artifact@v6
         if: matrix.rust == 'nightly' && always()

data/rust-vendor/quote/Cargo.lock

@@ -44,9 +44,9 @@ checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "proc-macro2"
@@ -59,16 +59,16 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.44"
+version = "1.0.45"
 dependencies = [
  "proc-macro2",
  "rustversion",
@@ -106,7 +106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
- "quote 1.0.43",
+ "quote 1.0.44",
  "syn",
 ]
 
@@ -134,12 +134,12 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.114"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
- "quote 1.0.43",
+ "quote 1.0.44",
  "unicode-ident",
 ]
 
@@ -160,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.9.11+spec-1.1.0"
+version = "1.0.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
+checksum = "c7614eaf19ad818347db24addfa201729cf2a9b6fdfd9eb0ab870fcacc606c0c"
 dependencies = [
  "indexmap",
  "serde_core",
@@ -175,18 +175,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.5+spec-1.1.0"
+version = "1.0.0+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.0.9+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
 dependencies = [
  "winnow",
 ]
@@ -199,9 +199,9 @@ checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
 
 [[package]]
 name = "trybuild"
-version = "1.0.114"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17e807bff86d2a06b52bca4276746584a78375055b6e45843925ce2802b335"
+checksum = "47c635f0191bd3a2941013e5062667100969f8c4e9cd787c14f977265d73616e"
 dependencies = [
  "dissimilar",
  "glob",
@@ -215,9 +215,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "winapi-util"
@@ -251,6 +251,6 @@ checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 
 [[package]]
 name = "zmij"
-version = "1.0.16"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfcd145825aace48cff44a8844de64bf75feec3080e0aa5cdbde72961ae51a65"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"

data/rust-vendor/quote/Cargo.toml

@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.71"
 name = "quote"
-version = "1.0.44"
+version = "1.0.45"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 build = "build.rs"
 autolib = false

data/rust-vendor/quote/Cargo.toml.orig

@@ -1,6 +1,6 @@
 [package]
 name = "quote"
-version = "1.0.44"
+version = "1.0.45"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 autobenches = false
 categories = ["development-tools::procedural-macro-helpers"]
@@ -10,7 +10,7 @@ edition = "2021"
 keywords = ["macros", "syn"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/quote"
-rust-version = "1.68"
+rust-version = "1.71"
 
 [dependencies]
 proc-macro2 = { version = "1.0.80", default-features = false }

data/rust-vendor/quote/README.md

@@ -34,7 +34,6 @@ macros.
 quote = "1.0"
 ```
 
-*Version requirement: Quote supports rustc 1.68 and up.*<br>
 [*Release notes*](https://github.com/dtolnay/quote/releases)
 
 <br>

data/rust-vendor/quote/src/lib.rs

@@ -89,7 +89,7 @@
 //! [prettyplease]: https://github.com/dtolnay/prettyplease
 
 #![no_std]
-#![doc(html_root_url = "https://docs.rs/quote/1.0.44")]
+#![doc(html_root_url = "https://docs.rs/quote/1.0.45")]
 #![allow(
     clippy::doc_markdown,
     clippy::elidable_lifetime_names,

data/rust-vendor/quote/src/to_tokens.rs

@@ -1,4 +1,5 @@
 use super::TokenStreamExt;
+use std::sync::Arc;
 use alloc::borrow::{Cow, ToOwned};
 use alloc::boxed::Box;
 use alloc::ffi::CString;
@@ -104,6 +105,12 @@ impl<T: ?Sized + ToTokens> ToTokens for Rc<T> {
     }
 }
 
+impl<T: ?Sized + ToTokens> ToTokens for Arc<T> {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        (**self).to_tokens(tokens);
+    }
+}
+
 impl<T: ToTokens> ToTokens for Option<T> {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         if let Some(t) = self {

data/rust-vendor/quote/tests/ui/not-quotable.stderr

@@ -10,11 +10,11 @@ error[E0277]: the trait bound `Ipv4Addr: ToTokens` is not satisfied
   = help: the following other types implement trait `ToTokens`:
             &T
             &mut T
+            Arc<T>
             Box<T>
             CStr
             CString
             Cow<'a, T>
             Option<T>
-            Rc<T>
           and $N others
   = note: this error originates in the macro `quote` (in Nightly builds, run with -Z macro-backtrace for more info)

data/rust-vendor/quote/tests/ui/not-repeatable.stderr

@@ -2,7 +2,7 @@ error[E0599]: the method `quote_into_iter` exists for struct `Ipv4Addr`, but its
  --> tests/ui/not-repeatable.rs:7:13
   |
 3 | struct Ipv4Addr;
-  | --------------- method `quote_into_iter` not found for this struct because it doesn't satisfy `Ipv4Addr: Iterator`, `Ipv4Addr: ToTokens`, `Ipv4Addr: quote::__private::ext::RepIteratorExt` or `Ipv4Addr: quote::__private::ext::RepToTokensExt`
+  | --------------- method `quote_into_iter` not found for this struct because `Ipv4Addr` doesn't implement `Iterator` or `ToTokens`
 ...
 7 |     let _ = quote! { #(#ip)* };
   |             ^^^^^^^^^^^^^^^^^^ method cannot be called on `Ipv4Addr` due to unsatisfied trait bounds
@@ -19,8 +19,8 @@ error[E0599]: the method `quote_into_iter` exists for struct `Ipv4Addr`, but its
 note: the traits `Iterator` and `ToTokens` must be implemented
  --> $RUST/core/src/iter/traits/iterator.rs
   |
-  | pub trait Iterator {
-  | ^^^^^^^^^^^^^^^^^^
+  | pub const trait Iterator {
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
   |
  ::: src/to_tokens.rs
   |
@@ -32,11 +32,3 @@ note: the traits `Iterator` and `ToTokens` must be implemented
           candidate #2: `quote::__private::ext::RepIteratorExt`
           candidate #3: `quote::__private::ext::RepToTokensExt`
   = note: this error originates in the macro `$crate::quote_bind_into_iter` which comes from the expansion of the macro `quote` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0282]: type annotations needed
- --> tests/ui/not-repeatable.rs:7:13
-  |
-7 |     let _ = quote! { #(#ip)* };
-  |             ^^^^^^^^^^^^^^^^^^ cannot infer type
-  |
-  = note: this error originates in the macro `$crate::quote_bind_next_or_break` which comes from the expansion of the macro `quote` (in Nightly builds, run with -Z macro-backtrace for more info)

data/rust-vendor/r-efi/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{".cargo_vcs_info.json":"50e0c72ee0164f182d7b5db0213cdb1626bad950f2443b05d006c28c7f0641b5",".github/workflows/publish.yml":"431c68b9d566180134e8771ea9cb9339d72ec77c3010b4cedfd423e271dc7386",".github/workflows/rust-tests.yml":"ca7ba173da0a6510676770b103119ce57029d424afe9e1027541d529af6c7f3f","AUTHORS":"ff92bed461f50338dd703a9ba9aee496a425957873df1d91192776e4bdf5dda7","Cargo.lock":"cc335892128a13fb1431213f65cfd3281ff098cf47b97882ca097f0206d7e0b0","Cargo.toml":"dba000c0173b09b1e3b69afa42a715b5ab64355e6502ce6d9d1767c7845cf402","Cargo.toml.orig":"57b6d9b9a1b6524f6b4dcc1dd24970ac03e6959786a6cfedaec9ba52878b4d3e","Makefile":"b445cfadd750b564ba8ef072754a4eed5aa127f12faa6e5b15a35b748d28b6fb","NEWS.md":"a8924309f9b5d8cf035b12ee47d4afe99c3ca57ea60061239263ac0b0e2161ba","README.md":"420f65fec3ba2e89d49da51b222d2881d26959037a7b7d3794143db4bd4627b1","examples/freestanding.rs":"0be5eb60397228306aa9f8afc533e32926d210205a7359e14da903159482416d","examples/gop-query.rs":"3257c55d6ae4572db1bfcaf20bc05990ea92d46c5d292eb99c278242f1007e2c","examples/hello-world.rs":"1a398f93a54bfddaab6ba3e0145cf70496266c44b9748a11ff569a9a18063bc4","src/base.rs":"e0f0b69967dc436e302f37230f5aff0e8bf748f6a1159b968180e6d0ac0b9644","src/hii.rs":"d0b19b7cc7b0c2c4d70e2891554ed6d7f941388709476eab6fa7bad129c583ed","src/lib.rs":"289fdfa8384062616aa39b49c4094b93849ff0a2e5f6d7125b40124299a0837e","src/protocols.rs":"a8f1c0d9abf2af2d7962fce68160a3bf8083165bb70861808423afedadee6602","src/protocols/absolute_pointer.rs":"46ad9792ea021f47e4fedf8d3c07769872e056c39936c9647492a52455558b41","src/protocols/block_io.rs":"4f70d38453f057bb240988d7fac593ffa0f38a0057c6e8855f34ff37801e7f3d","src/protocols/bus_specific_driver_override.rs":"a695a18e6729020919f99880fb14c2a26f565471f15d6300cb67475d33ec6087","src/protocols/debug_support.rs":"a03fc44a2ad151e58eff3bd72f910b63bfadd5802ac2fc157fc94c2030bd9fa9","src/protocols/debugport.rs":"bc491b03444ec35593a9cde519d0ab5fc863a046073dd813f1eb58c075da45dc","src/protocols/decompress.rs":"a4c67d958f0b9a392840a53eef69369acc6f545f90369685b3cae3c32e5cbc51","src/protocols/device_path.rs":"1a8c897f8e392fd7fe60d829b7852d22dd847f5f64bf1382e58e7776d9a176a2","src/protocols/device_path_from_text.rs":"e972d7699fb031df9da2c4d5623ae289d4cc282116b634218039b97d1e7628fe","src/protocols/device_path_to_text.rs":"9929d0797ab4892051bd15ac831dc2566f7106ec9edec0fd289b3c780a2b0976","src/protocols/device_path_utilities.rs":"7d7e9ba66e9f8add3c77718bd605e6e434598f2834236e7805aba57b531eba30","src/protocols/disk_io.rs":"01a68686dae958b4fbd9fd5bbc556cf41b61e7da281a0b4ea56e62e61822d843","src/protocols/disk_io2.rs":"33aeb807ab9b78534787f44e0a3a8c52afe057e23b48ecb6703195cd0b135a8e","src/protocols/driver_binding.rs":"f48363c5afd21aac39cbd2644be0e861acc4b182bc14c68a4f84e94a5f001f8d","src/protocols/driver_diagnostics2.rs":"62b0ffe6760ae0e90e51652c667ec623cef3bbd44c17fb89881a24167b1b446c","src/protocols/driver_family_override.rs":"004aceae8540766d87eb2cef9c8c37ab5aa3755920af6d960cb9171a41acb4a1","src/protocols/file.rs":"25f09f54cf3ebd69366bde5160218247c6712ae19dac17a36ec4e2881b214f93","src/protocols/graphics_output.rs":"9e9b7ac05b92ac0a9680506edb3ed36ebbac2dc9c800268b2c54cbf539e9dd9e","src/protocols/hii_database.rs":"faa82d420085dee851f8a332db00c888e7ed1685d43e2c286790a34b2ecfdf7a","src/protocols/hii_font.rs":"092f45c74335c524ee379508e2b6925ed9033c7c10928e64b2489ca3778a4723","src/protocols/hii_font_ex.rs":"2400b2092c14da2aa09c62266356321d4b96838dc41c5918a2f3e0e1e3920318","src/protocols/hii_package_list.rs":"6bb29d076697bb3b672913b98f55995f9efcba830b4ab6bfed29bd8402aa70ab","src/protocols/hii_string.rs":"1327ba9e108900ddafec98c02534c81104c3c47cad32a7d17c7b7a7ee723c86f","src/protocols/ip4.rs":"252d244ec9b098fcee6a185ffa98cbdee34164c7872fe30b07d5e8dfdf7a8fe3","src/protocols/ip6.rs":"72a51653aa4535f7b136a7bacaa1718e0a68be847d4a716c6e76b7f75a94e6ea","src/protocols/load_file.rs":"8aa4a43db3da6c71398eb9408b2be9b893eb2147e5317a0f977e998db2910cba","src/protocols/load_file2.rs":"5be9c5d501b4f10a44ba91448fce5d4a20c01eab9a8f7fb3c63eaa62cbb1c2f4","src/protocols/loaded_image.rs":"508cf1514071e611f3c70776463a19f53685b3569c52a2350f307cbeac9cbbcc","src/protocols/loaded_image_device_path.rs":"66e8fe3477785dadf96401da10e203ba729e54d7eddedaffc4d17acc9a0daf7f","src/protocols/managed_network.rs":"592111dee58137a21f3b49211baf0d9c73a14ca9de95fa31d7e87435ded3808d","src/protocols/memory_attribute.rs":"c512ae777b95248127fc39b63eb99d746aaf8a5dc2cfda167d15ea5aa627653c","src/protocols/mp_services.rs":"509e7d483df52ab1ba1f9241bb7b286ffe205c4328557b3115cd290b4c9f8278","src/protocols/pci_io.rs":"43dac18dfa284d83836ff1ccfb8e40d48ef94533b72cdb99ce30a768f70be67c","src/protocols/platform_driver_override.rs":"f0ada483bccd90f31a6f0ce8831ea00885b66ca558e34e347ec775cbc171534c","src/protocols/rng.rs":"279ce976d190889064d0159b10586bab9a2e5670368b460be4497ead523d6dda","src/protocols/service_binding.rs":"256920333ea26fabd3b62ba8a8b25068349acab6da01a807dfba3307a45d79a0","src/protocols/shell.rs":"3259b0bf2574da6b2343da0b9ce46980d296a8e6d8c2fe36df3a07d0629ad653","src/protocols/shell_dynamic_command.rs":"9c2f977fe4e0757b633de49627a9645d81c821a39e752cb329f6285d376fe52d","src/protocols/shell_parameters.rs":"fb88c63822a14dc94e96f7912fa5409f68b669105fb81459b969ec066002e352","src/protocols/simple_file_system.rs":"e3d870bdaf3ae0f0cded7817a4eda6d5dea2e0b77855cd21c7ac05046c77b564","src/protocols/simple_network.rs":"8b8c49872488cc0e759efe74c04fc65f5d7637dca7d9a0a1cedb5dafb2597acb","src/protocols/simple_text_input.rs":"d9a7e8cbf508daedaa26dc8301e52be957edfcc12be9e962b8504584aee669a8","src/protocols/simple_text_input_ex.rs":"84ccd2ff2c354c0447a9c46406ad76de018495d5f85979cf35d78b7070a8f63c","src/protocols/simple_text_output.rs":"05857880b5c0a6fb6ce83eedcc7fa25107f368950ab18a3d0ef1ed669d3456df","src/protocols/tcp4.rs":"2131cf06fd856017ea45135fb59264a43fabc3db1b7ddc90cd19c169ccdacae9","src/protocols/tcp6.rs":"98c24c43632acc60f2dc558c13a03657f93edca735435c50b9f2cc5625f7d3bb","src/protocols/timestamp.rs":"118cc4a54da4f53a4bb2fbf66cde8c433208266a22b59b4e370393f5a40c20a9","src/protocols/udp4.rs":"c4d344a40c674524383be51621a485d15ccfffaa94a1050c7a4642199fa91bf6","src/protocols/udp6.rs":"ea4ee2154e045a4e5992688e6cafed2d5a5de41f2796f5c070e739818b361550","src/system.rs":"2428de82301085a5c99b1b54411530adf2c895aa311a58c94c1b8e9eb247b18f","src/vendor.rs":"6cc53fe0e98220fe627d82c9b27f1468095358bb26634a8c19274495888138af","src/vendor/intel/console_control.rs":"03a7fdf97ab1836353266786811ac47171d1c425dcead707f5ed0e2e834873fb"},"package":"69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"}
+{"files":{".cargo_vcs_info.json":"d8d0d853429b028d5e3c7b969f7c6b77b04e17486c57fac0759eb8083a359f3f",".github/workflows/publish.yml":"431c68b9d566180134e8771ea9cb9339d72ec77c3010b4cedfd423e271dc7386",".github/workflows/rust-tests.yml":"ca7ba173da0a6510676770b103119ce57029d424afe9e1027541d529af6c7f3f","AUTHORS":"d027e91dbc9cdbb2f1190068e498bd6b61cff022b6a032b191021ba658d96111","Cargo.lock":"78ff5baf710cdea584efe5a5178a658f368a4de740bd53d8733347d004767c4c","Cargo.toml":"a021f9fb0645cc5de5770cf7f41594c1deff4b388eca933b289752aa52666829","Cargo.toml.orig":"b8e89c393831c2161b6d390bd40422910ac34f02903ad39edd85ec38d4513fef","Makefile":"b445cfadd750b564ba8ef072754a4eed5aa127f12faa6e5b15a35b748d28b6fb","NEWS.md":"e815ccc6fb453ed64d5e1b73fb4ca6204a3f8f65e3ab0afdb86da65b5209e33d","README.md":"420f65fec3ba2e89d49da51b222d2881d26959037a7b7d3794143db4bd4627b1","examples/freestanding.rs":"0be5eb60397228306aa9f8afc533e32926d210205a7359e14da903159482416d","examples/gop-query.rs":"3257c55d6ae4572db1bfcaf20bc05990ea92d46c5d292eb99c278242f1007e2c","examples/hello-world.rs":"1a398f93a54bfddaab6ba3e0145cf70496266c44b9748a11ff569a9a18063bc4","src/base.rs":"864924a118f60edcdc9eaf8bdab31879ab1143166905e6eb0657f6f08d17b9a1","src/hii.rs":"d0b19b7cc7b0c2c4d70e2891554ed6d7f941388709476eab6fa7bad129c583ed","src/lib.rs":"6215dd213f39f5180f7cfad599df1d17d50f089dc1ad0c840bc647a0bc421953","src/protocols.rs":"a8f1c0d9abf2af2d7962fce68160a3bf8083165bb70861808423afedadee6602","src/protocols/absolute_pointer.rs":"b486324e1d2e352ca15e865afe97132a4b260609541f327c041bc947b2ddcd09","src/protocols/block_io.rs":"7fc213e8c07897b9318982e1d1f8b7c492ce0c881c4cd1d38d3eb91e590585ed","src/protocols/bus_specific_driver_override.rs":"e482a908e9d5027f10e449f5039a66db035fdef18329778a5ae97a094586888a","src/protocols/debug_support.rs":"16f17179ef274ef45c65d2fc8ff5db1e2131d8b3b4c86b9b531926642009a468","src/protocols/debugport.rs":"abe5b09e2192e6b8290205538947a79f433529ba2bb57708f74ea2b6f4172f6b","src/protocols/decompress.rs":"d10500f1f155ade02164e87c42ea81e7a767f20888a1f6ef189291492196ddbc","src/protocols/device_path.rs":"1a8c897f8e392fd7fe60d829b7852d22dd847f5f64bf1382e58e7776d9a176a2","src/protocols/device_path_from_text.rs":"9a4bb364b57e3dc39b40b93e2096e82a10b3251643e81de9f2c8abd40e705005","src/protocols/device_path_to_text.rs":"b2b1325aed4a4fcf142fae8208308590f2fa53eea999bb1bf22f592bf25109eb","src/protocols/device_path_utilities.rs":"36960de844fcf2634a9180ffd621f0b9771ffb4acc364d74c34680bbf58ee224","src/protocols/disk_io.rs":"831e774ddd1a75839c5d89cd704c2d59bb0adce554eecdc8bb12e9569b7a8747","src/protocols/disk_io2.rs":"645a83979e91679036ebc90fd8ab584158055a6c8316aaf620300470aac4ba2d","src/protocols/driver_binding.rs":"60bf714b8bb5d2ed183335e1d745a7150eb59d0d59241eb29251682ec1224434","src/protocols/driver_diagnostics2.rs":"dcbcd95b327768d70637ded79140e609a36aa1369f16c58764c8d161d072e615","src/protocols/driver_family_override.rs":"42ae2f96a94ea516f9696162d12e65613f4acc3cb78831be22d868846574d231","src/protocols/file.rs":"a4136bedb02272296b2246a9b4bee1096456d4c2e078bed5d1330c77d8666a6d","src/protocols/graphics_output.rs":"7c185179a32558f506eb84402c26e3bdb8bee795c1403d493fd24c7d9c3a07a9","src/protocols/hii_database.rs":"4af0d8ab357faffd568c12f2ce8df518dd3e186c1da980fbe2198f20e3ce0ac5","src/protocols/hii_font.rs":"d8a418f8b0776cd2cce0c60b457f8c09b63aadd64e6f9ce75526ddc1c5c32b80","src/protocols/hii_font_ex.rs":"f856de80e759a9c503ce5d3cca5092ec12739ab0b157f4bac8819b5275b730e9","src/protocols/hii_package_list.rs":"6bb29d076697bb3b672913b98f55995f9efcba830b4ab6bfed29bd8402aa70ab","src/protocols/hii_string.rs":"e8e725fae9860fdcdd777a0b99e48b7e4a5f5f464827414bb0aeed139ea5b993","src/protocols/ip4.rs":"09290d2a5a2cafd2b834ce86b59917d0f25d7d16f4f329aeedc171a8147ebef7","src/protocols/ip6.rs":"511de9f36af4c320f74e424c64433a70f1bd66e8b6fc9daa0e1744a0b46b1a5d","src/protocols/load_file.rs":"e8c845eb1812c3967bb026ef60ab40826e35e6fa3185007357b19311cef67eaf","src/protocols/load_file2.rs":"5be9c5d501b4f10a44ba91448fce5d4a20c01eab9a8f7fb3c63eaa62cbb1c2f4","src/protocols/loaded_image.rs":"64447c64a0a4ac3b79263bf2564ff1a930b2424ca2fd93e37d714c16c31a7205","src/protocols/loaded_image_device_path.rs":"66e8fe3477785dadf96401da10e203ba729e54d7eddedaffc4d17acc9a0daf7f","src/protocols/managed_network.rs":"f1acc8d727fa9a1fba7b376ed093c129dd8fddc8d164ca59c201e37f276e0525","src/protocols/memory_attribute.rs":"1aa7a99ed6fd268e1921dc073634cf9346759c048f5c90bef2928ac27e56a125","src/protocols/mp_services.rs":"d98a27d29f835b011a09eafaf276dd921328dc7b676713c1c437f4adef5409a6","src/protocols/pci_io.rs":"4b7ad8d7b9ee0d5e50e09b6ca12467ec4b43dfb3e455cfdd1e6e10617e26d171","src/protocols/platform_driver_override.rs":"5eb7cbc2609b0369cf380fa54be963f331124cae3fc5fd19fe75212dba4d3d9c","src/protocols/rng.rs":"a9f4854fa54acab7e8638d37e9c0b71ce36d02fcdc37b2d43726ba9686e8a3a9","src/protocols/service_binding.rs":"7c3b7c4256499451efc922d00f021479ae743706b5ed36c86aaf55c225612675","src/protocols/shell.rs":"e9fb2ab62988067d13ee839c10aacf47d94f5e92c213e1670530fe1c472925f8","src/protocols/shell_dynamic_command.rs":"e13f152c2ca57988d1b2b476b45cd6e6dc899e76359ecb2d8e04aeb55ca480ca","src/protocols/shell_parameters.rs":"fb88c63822a14dc94e96f7912fa5409f68b669105fb81459b969ec066002e352","src/protocols/simple_file_system.rs":"019910e8f5c44ba6a98ff9848eafa31e05c32833a69fbee108f2dd322bdb1748","src/protocols/simple_network.rs":"fd12bd27444634064fe5e2308b0504d452b18092d5f6e0fcba2e35cc40998b54","src/protocols/simple_text_input.rs":"673944368289c1f11313944416512169a461a8703cef039e50e1414e291152b1","src/protocols/simple_text_input_ex.rs":"b9514fe34f105dc88b9241c88adeefc18e33cbd692acc164fa0a25dbaee24c6d","src/protocols/simple_text_output.rs":"835f5ec786c1a688384b3280dcc5f75383f7822938b9ea16c9e9b802a183d293","src/protocols/tcp4.rs":"90facae493a4a5ca192c45cc323528613398f076b5d4449ac9ad617a32217f4d","src/protocols/tcp6.rs":"cf99e4cb9cadcd9ea4ef349afbb343090cae71a1324bb4e7812834f465a5b8c6","src/protocols/timestamp.rs":"ea8e5ed87c9fce83c037038bdee5daf92946631cc41774b288e6dfc5811cb64f","src/protocols/udp4.rs":"bc85ba588df857a233132c42b7fb3418acb6d89581a5b4ab2d6156e18bb17547","src/protocols/udp6.rs":"806ed1cbd53874f8a171aa3f86fdd40f2fcaa493dc2eadb0c286d8e4d67078e8","src/system.rs":"54ebb9a3842fc62a7dd4a2240490f6563c66904a14c1f81961a3677a54d85390","src/vendor.rs":"6cc53fe0e98220fe627d82c9b27f1468095358bb26634a8c19274495888138af","src/vendor/intel/console_control.rs":"05363b80feb22aa585cbe16ec4a1c8e1ef592e8e57b1a676de0562723c729275"},"package":"f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"}

data/rust-vendor/r-efi/.cargo_vcs_info.json

@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "97b55bed1c2c91dcbf787674849f05337ff80b33"
+    "sha1": "7e1b0322d31d625f81a5656096330934f9cd835d"
   },
   "path_in_vcs": ""
 }

data/rust-vendor/r-efi/AUTHORS

@@ -56,6 +56,7 @@ COPYRIGHT: (ordered alphabetically)
         Copyright (C) 2022-2023 David Rheinsberg
 
 AUTHORS: (ordered alphabetically)
+        Alan Egerton <eggyal@gmail.com>
         Alex James <theracermaster@gmail.com>
         Ayush Singh <ayushsingh1325@gmail.com>
         Boris-Chengbiao Zhou <bobo1239@web.de>

data/rust-vendor/r-efi/Cargo.lock

@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "r-efi"
-version = "5.3.0"
+version = "6.0.0"
 dependencies = [
  "rustc-std-workspace-core",
 ]

data/rust-vendor/r-efi/Cargo.toml

@@ -13,7 +13,7 @@
 edition = "2018"
 rust-version = "1.68"
 name = "r-efi"
-version = "5.3.0"
+version = "6.0.0"
 build = false
 autolib = false
 autobins = false
@@ -40,8 +40,6 @@ license = "MIT OR Apache-2.0 OR LGPL-2.1-or-later"
 repository = "https://github.com/r-efi/r-efi"
 
 [features]
-efiapi = []
-examples = ["native"]
 native = []
 rustc-dep-of-std = ["core"]
 

data/rust-vendor/r-efi/Cargo.toml.orig

@@ -1,6 +1,6 @@
 [package]
 name = "r-efi"
-version = "5.3.0"
+version = "6.0.0"
 
 categories = [
         "embedded",
@@ -28,10 +28,6 @@ rust-version = "1.68"
 core = { version = '1.0.0', optional = true, package = 'rustc-std-workspace-core' }
 
 [features]
-# No-op for backwards compatibility.
-efiapi = []
-# Maps to `native` for backwards compatibility.
-examples = ['native']
 # We feature-gate all native code, since it will not link correctly, unless you
 # use a UEFI target configuration. To make `cargo test` work, we exclude all
 # these from normal runs.

data/rust-vendor/r-efi/NEWS.md

@@ -1,5 +1,21 @@
 # r-efi - UEFI Reference Specification Protocol Constants and Definitions
 
+## CHANGES WITH 6.0.0:
+
+        * Change all function prototypes to use `unsafe fn`. This is a major
+          change, but reflects what all downstream users have already assumed.
+
+        * Drop the obsolete `efiapi` and `examples` feature flags. The former
+          was unused, and the latter is an alias for `native`.
+
+        * The `eficall!{}` macro is now fully inline in all of r-efi. It is
+          still provided for external users, but will no longer be used by
+          r-efi. All users are recommended to use `extern "efiapi"` directly.
+
+        Contributions from: Alan Egerton, David Rheinsberg
+
+        - Dußlingen, 2026-02-03
+
 ## CHANGES WITH 5.3.0:
 
         * Remove the optional dependency on `compiler-builtins`, which was

data/rust-vendor/r-efi/src/base.rs

@@ -353,7 +353,7 @@ pub type VirtualAddress = u64;
 /// invocation, if invoked as an UEFI driver.
 /// In most cases it is perfectly fine to cast the pointer to a real rust reference. However, this
 /// should be an explicit decision by the caller.
-pub type ImageEntryPoint = eficall! {fn(Handle, *mut crate::system::SystemTable) -> Status};
+pub type ImageEntryPoint = unsafe extern "efiapi" fn(Handle, *mut crate::system::SystemTable) -> Status;
 
 /// Globally Unique Identifiers
 ///

data/rust-vendor/r-efi/src/lib.rs

@@ -71,22 +71,37 @@
 //!    pointers, we use `Option<fn ...>`.
 //!
 //!  * `prefer *mut over *const`: Whenever we transpose pointers from the
-//!    specification into Rust, we prefer `*mut` in almost all cases. `*const`
-//!    should only be used if the underlying value is known not to be accessible
-//!    via any other mutable pointer type. Since this is rarely the case in
-//!    UEFI, we avoid it.
-//!
-//!    The reasoning is that Rust allows coercing immutable types into `*const`
-//!    pointers, without any explicit casting required. However, immutable Rust
-//!    references require that no other mutable reference exists simultaneously.
-//!    This is not a guarantee of `const`-pointers in C / UEFI, hence this
-//!    coercion is usually ill-advised or even wrong.
-//!
-//!    Lastly, note that `*mut` and `*const` and be `as`-casted in both
+//!    specification into Rust, we default to `*mut`. So far, there is no
+//!    reason to use `*const`. We prefer `*mut T`, because:
+//!
+//!    * it is invariant over `T`, unlike `*const T`, which is covariant over
+//!      `T`. This variance is useful when treating the raw pointer like a
+//!      shared reference (which is also covariant over `T`). However, if the
+//!      raw pointer can be aliases by mutable pointers somewhere in the UEFI
+//!      stack, the variance might no longer apply. Using `*mut T` avoids this
+//!      default covariance, and requires callers to introduce manually if
+//!      desired.
+//!    * it cannot be automatically coerced from shared references. This
+//!      coercion is not necessarily correct, given that `const T *` pointers
+//!      in C do not share the immutability guarantee of Rust shared
+//!      references. By using `*mut T` an explicit pointer cast is required,
+//!      which we definitely want.
+//!    * it correctly conveys mutability to Miri Stacked Borrows. While Tree
+//!      Borrows do not distinguish raw pointers, Stacked Borrows do, and they
+//!      require a pointer to originate from a mutable reference if mutability
+//!      is desired.
+//!
+//!    Lastly, note that `*mut` and `*const` can be `as`-casted in both
 //!    directions without violating any Rust guarantees. Any UB concerns always
 //!    stem from the safety guarantees of the surrounding code, not of the
 //!    raw-pointer handling.
 //!
+//!  * `default to unsafe fn`: Always use `unsafe fn` for function prototypes.
+//!    UEFI makes no guarantees about global state, as such any implementation
+//!    of any UEFI prototype might introduce unsafety. Use `unsafe fn`
+//!    unconditionally, so the prototypes can be used for externally provided
+//!    code.
+//!
 //! # Specification Details
 //!
 //! This section lists errata of, and general comments on, the UEFI

data/rust-vendor/r-efi/src/protocols/absolute_pointer.rs

@@ -50,15 +50,15 @@ pub struct State {
     pub active_buttons: u32,
 }
 
-pub type Reset = eficall! {fn(
+pub type Reset = unsafe extern "efiapi" fn(
     this: *mut Protocol,
     extended_verification: bool,
-) -> crate::base::Status};
+) -> crate::base::Status;
 
-pub type GetState = eficall! {fn(
+pub type GetState = unsafe extern "efiapi" fn(
     this: *mut Protocol,
     state: *mut State,
-) -> crate::base::Status};
+) -> crate::base::Status;
 
 #[repr(C)]
 pub struct Protocol {

data/rust-vendor/r-efi/src/protocols/block_io.rs

@@ -34,30 +34,30 @@ pub struct Media {
     pub optimal_transfer_length_granularity: u32,
 }
 
-pub type ProtocolReset = eficall! {fn(
+pub type ProtocolReset = unsafe extern "efiapi" fn(
     *mut Protocol,
     crate::base::Boolean,
-) -> crate::base::Status};
+) -> crate::base::Status;
 
-pub type ProtocolReadBlocks = eficall! {fn(
+pub type ProtocolReadBlocks = unsafe extern "efiapi" fn(
     *mut Protocol,
     u32,
     crate::base::Lba,
     usize,
     *mut core::ffi::c_void,
-) -> crate::base::Status};
+) -> crate::base::Status;
 
-pub type ProtocolWriteBlocks = eficall! {fn(
+pub type ProtocolWriteBlocks = unsafe extern "efiapi" fn(
     *mut Protocol,
     u32,
     crate::base::Lba,
     usize,
     *mut core::ffi::c_void,
-) -> crate::base::Status};
+) -> crate::base::Status;
 
-pub type ProtocolFlushBlocks = eficall! {fn(
+pub type ProtocolFlushBlocks = unsafe extern "efiapi" fn(
     *mut Protocol,
-) -> crate::base::Status};
+) -> crate::base::Status;
 
 #[repr(C)]
 pub struct Protocol {

data/rust-vendor/r-efi/src/protocols/bus_specific_driver_override.rs

@@ -21,10 +21,10 @@ pub const PROTOCOL_GUID: crate::base::Guid = crate::base::Guid::from_fields(
     &[0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65],
 );
 
-pub type ProtocolGetDriver = eficall! {fn(
+pub type ProtocolGetDriver = unsafe extern "efiapi" fn(
     *mut Protocol,
     *mut crate::base::Handle,
-) -> crate::base::Status};
+) -> crate::base::Status;
 
 #[repr(C)]
 pub struct Protocol {