Rollup merge of rust-lang#87028 - aDotInTheVoid:patch-1, r=petrochenkov

JohnTitor · web-flow · commit 36b142f5c110 · 2021-07-11T01:15:43.000+09:00
Fix type: `'satic` -> `'static` Pointed out on discord: https://discord.com/channels/273534239310479360/490356824420122645/863434443170250793 ~~The fact that this compiles is probably a bug.~~ Nope it's `#![feature(in_band_lifetimes)]` (Thanks to [floppy](https://discord.com/channels/273534239310479360/490356824420122645/863437381671059486) ~~[The docs](https://doc.rust-lang.org/stable/nightly-rustc/rustc_mir/transform/inline/struct.Inliner.html#method.check_codegen_attributes) seem to indicate rust thinks this function is generic over the lifetime `'satic`~~ This is because of `in_band_lifetimes`
diff --git a/compiler/rustc_mir/src/transform/inline.rs b/compiler/rustc_mir/src/transform/inline.rs
@@ -284,7 +284,7 @@ impl Inliner<'tcx> {
         &self,
         callsite: &CallSite<'tcx>,
         callee_attrs: &CodegenFnAttrs,
-    ) -> Result<(), &'satic str> {
+    ) -> Result<(), &'static str> {
         if let InlineAttr::Never = callee_attrs.inline {
             return Err("never inline hint");
         }

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ impl Inliner<'tcx> {`
`284`	`284`	`&self,`
`285`	`285`	`callsite: &CallSite<'tcx>,`
`286`	`286`	`callee_attrs: &CodegenFnAttrs,`
`287`		`- ) -> Result<(), &'satic str> {`
	`287`	`+ ) -> Result<(), &'static str> {`
`288`	`288`	`if let InlineAttr::Never = callee_attrs.inline {`
`289`	`289`	`return Err("never inline hint");`
`290`	`290`	`}`