Skip to content

Commit

Permalink
experiment: try setting -Zforce-unstable-if-unmarked
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed Aug 24, 2023
1 parent b87dd5b commit 9e4d739
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 85 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 'master'
- 'ci'
pull_request:
branches:
- 'master'
Expand Down
2 changes: 1 addition & 1 deletion ci-test.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -euo pipefail

DEFAULTFLAGS="-Zmiri-retag-fields -Zrandomize-layout -Zmiri-strict-provenance"
DEFAULTFLAGS="-Zmiri-retag-fields -Zrandomize-layout -Zmiri-strict-provenance -Zforce-unstable-if-unmarked"

# apply our patch
rm -rf rust-src-patched
Expand Down
84 changes: 0 additions & 84 deletions rust-src.diff
Original file line number Diff line number Diff line change
@@ -1,84 +0,0 @@
diff --git a/library/core/src/error.rs b/library/core/src/error.rs
index c32a54b77ef..1170221c10c 100644
--- a/library/core/src/error.rs
+++ b/library/core/src/error.rs
@@ -130,6 +130,7 @@ fn cause(&self) -> Option<&dyn Error> {
///
/// ```rust
/// #![feature(error_generic_member_access)]
+ /// #![feature(error_in_core)]
/// use core::fmt;
/// use core::error::{request_ref, Request};
///
@@ -360,6 +361,7 @@ pub fn sources(&self) -> Source<'_> {
///
/// ```rust
/// # #![feature(error_generic_member_access)]
+/// # #![feature(error_in_core)]
/// use std::error::Error;
/// use core::error::request_value;
///
@@ -383,6 +385,7 @@ pub fn request_value<'a, T>(err: &'a (impl Error + ?Sized)) -> Option<T>
///
/// ```rust
/// # #![feature(error_generic_member_access)]
+/// # #![feature(error_in_core)]
/// use core::error::Error;
/// use core::error::request_ref;
///
@@ -454,6 +457,7 @@ fn request_by_type_tag<'a, I>(err: &'a (impl Error + ?Sized)) -> Option<I::Reifi
///
/// ```
/// #![feature(error_generic_member_access)]
+/// #![feature(error_in_core)]
/// use core::fmt;
/// use core::error::Request;
/// use core::error::request_ref;
@@ -524,6 +528,7 @@ fn new<'b>(erased: &'b mut (dyn Erased<'a> + 'a)) -> &'b mut Request<'a> {
///
/// ```rust
/// #![feature(error_generic_member_access)]
+ /// #![feature(error_in_core)]
///
/// use core::error::Request;
///
@@ -558,6 +563,7 @@ pub fn provide_value<T>(&mut self, value: T) -> &mut Self
///
/// ```rust
/// #![feature(error_generic_member_access)]
+ /// #![feature(error_in_core)]
///
/// use core::error::Request;
///
@@ -593,6 +599,7 @@ pub fn provide_value_with<T>(&mut self, fulfil: impl FnOnce() -> T) -> &mut Self
///
/// ```rust
/// #![feature(error_generic_member_access)]
+ /// #![feature(error_in_core)]
///
/// use core::error::Request;
///
@@ -625,6 +632,7 @@ pub fn provide_ref<T: ?Sized + 'static>(&mut self, value: &'a T) -> &mut Self {
///
/// ```rust
/// #![feature(error_generic_member_access)]
+ /// #![feature(error_in_core)]
///
/// use core::error::Request;
///
@@ -691,6 +699,7 @@ fn provide_with<I>(&mut self, fulfil: impl FnOnce() -> I::Reified) -> &mut Self
///
/// ```rust
/// #![feature(error_generic_member_access)]
+ /// #![feature(error_in_core)]
///
/// use core::error::Request;
/// use core::error::request_value;
@@ -778,6 +787,7 @@ pub fn would_be_satisfied_by_value_of<T>(&self) -> bool
///
/// ```rust
/// #![feature(error_generic_member_access)]
+ /// #![feature(error_in_core)]
///
/// use core::error::Request;
/// use core::error::request_ref;

0 comments on commit 9e4d739

Please sign in to comment.