Skip to content

Commit

Permalink
Auto merge of rust-lang#99210 - Dylan-DPC:rollup-879cp1t, r=Dylan-DPC
Browse files Browse the repository at this point in the history
Rollup of 5 pull requests

Successful merges:

 - rust-lang#98574 (Lower let-else in MIR)
 - rust-lang#99011 (`UnsafeCell` blocks niches inside its nested type from being available outside)
 - rust-lang#99030 (diagnostics: error messages when struct literals fail to parse)
 - rust-lang#99155 (Keep unstable target features for asm feature checking)
 - rust-lang#99199 (Refactor: remove an unnecessary `span_to_snippet`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed Jul 13, 2022
2 parents 9efccc9 + 38c321a commit 4338881
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
}
}

fn target_features(&self, _sess: &Session) -> Vec<rustc_span::Symbol> {
fn target_features(&self, _sess: &Session, _allow_unstable: bool) -> Vec<rustc_span::Symbol> {
vec![]
}

Expand Down

0 comments on commit 4338881

Please sign in to comment.