mirror of
https://git.proxmox.com/git/rustc
synced 2025-08-24 11:26:42 +00:00

instead of a mix of git and quilt patches Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From: Simon Chopin <simon.chopin@canonical.com>
|
|
Date: Thu, 13 Jun 2024 11:16:41 +0200
|
|
Subject: Disable the doctests for the instruction_set errors
|
|
|
|
Bug: https://github.com/rust-lang/rust/issues/83453
|
|
Last-Update: 2022-02-23
|
|
|
|
The fix is as described in the upstream issue.
|
|
---
|
|
compiler/rustc_error_codes/src/error_codes/E0778.md | 4 ++--
|
|
compiler/rustc_error_codes/src/error_codes/E0779.md | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/compiler/rustc_error_codes/src/error_codes/E0778.md b/compiler/rustc_error_codes/src/error_codes/E0778.md
|
|
index 467362d..d5688c2 100644
|
|
--- a/compiler/rustc_error_codes/src/error_codes/E0778.md
|
|
+++ b/compiler/rustc_error_codes/src/error_codes/E0778.md
|
|
@@ -16,7 +16,7 @@ specified:
|
|
```
|
|
#![feature(isa_attribute)]
|
|
|
|
-#[cfg_attr(target_arch="arm", instruction_set(arm::a32))]
|
|
+#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::a32))]
|
|
fn something() {}
|
|
```
|
|
|
|
@@ -25,7 +25,7 @@ or:
|
|
```
|
|
#![feature(isa_attribute)]
|
|
|
|
-#[cfg_attr(target_arch="arm", instruction_set(arm::t32))]
|
|
+#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::t32))]
|
|
fn something() {}
|
|
```
|
|
|
|
diff --git a/compiler/rustc_error_codes/src/error_codes/E0779.md b/compiler/rustc_error_codes/src/error_codes/E0779.md
|
|
index 146e20c..9d23322 100644
|
|
--- a/compiler/rustc_error_codes/src/error_codes/E0779.md
|
|
+++ b/compiler/rustc_error_codes/src/error_codes/E0779.md
|
|
@@ -21,7 +21,7 @@ error. Example:
|
|
```
|
|
#![feature(isa_attribute)]
|
|
|
|
-#[cfg_attr(target_arch="arm", instruction_set(arm::a32))] // ok!
|
|
+#[cfg_attr(all(target_arch="arm", target_os="none"), instruction_set(arm::a32))] // ok!
|
|
pub fn something() {}
|
|
fn main() {}
|
|
```
|