merge rustc history

[rust.git] / src / tools / clippy / tests / ui / question_mark.rs

diff --git a/src/tools/clippy/tests/ui/question_mark.rs b/src/tools/clippy/tests/ui/question_mark.rs
index 9ae0d88829af55cb91d387cadd0bc84a83a119e8..436f027c215d54f459d244628acd9b358899c51c 100644 (file)
--- a/src/tools/clippy/tests/ui/question_mark.rs
+++ b/src/tools/clippy/tests/ui/question_mark.rs
@@ -259,12 +259,3 @@ fn pattern() -> Result<(), PatternedError> {
 }
 
 fn main() {}
-
-// should not lint, `?` operator not available in const context
-const fn issue9175(option: Option<()>) -> Option<()> {
-    if option.is_none() {
-        return None;
-    }
-    //stuff
-    Some(())
-}