Skip to content

Commit 9b9bc63

Browse files
committed
Auto merge of rust-lang#100977 - JohnTitor:rollup-8hc7rxh, r=JohnTitor
Rollup of 8 pull requests Successful merges: - rust-lang#99332 (Stabilize `#![feature(label_break_value)]`) - rust-lang#99954 (let-else: break out to one scope higher for let-else) - rust-lang#100188 (Parser will not suggest invalid expression when use public) - rust-lang#100780 (save_analysis: Migrate diagnostic) - rust-lang#100808 (Migrate `rustc_interface` diagnostics ) - rust-lang#100921 (Add a warning about `Option/Result::and()` being eagerly evaluated) - rust-lang#100960 (rustdoc: ayu code color selector more specific) - rust-lang#100964 (Sync rustc_codegen_cranelift) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5462da5 + f2878a6 commit 9b9bc63

File tree

110 files changed

+2658
-1443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+2658
-1443
lines changed

Cargo.lock

+2
Original file line numberDiff line numberDiff line change
@@ -4421,9 +4421,11 @@ dependencies = [
44214421
"rustc_ast",
44224422
"rustc_ast_pretty",
44234423
"rustc_data_structures",
4424+
"rustc_errors",
44244425
"rustc_hir",
44254426
"rustc_hir_pretty",
44264427
"rustc_lexer",
4428+
"rustc_macros",
44274429
"rustc_middle",
44284430
"rustc_session",
44294431
"rustc_span",

compiler/rustc_ast/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#![feature(const_default_impls)]
1414
#![feature(const_trait_impl)]
1515
#![feature(if_let_guard)]
16-
#![feature(label_break_value)]
16+
#![cfg_attr(bootstrap, feature(label_break_value))]
1717
#![feature(min_specialization)]
1818
#![feature(negative_impls)]
1919
#![feature(slice_internals)]

compiler/rustc_ast_passes/src/feature_gate.rs

-9
Original file line numberDiff line numberDiff line change
@@ -647,14 +647,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
647647
ast::ExprKind::TryBlock(_) => {
648648
gate_feature_post!(&self, try_blocks, e.span, "`try` expression is experimental");
649649
}
650-
ast::ExprKind::Block(_, Some(label)) => {
651-
gate_feature_post!(
652-
&self,
653-
label_break_value,
654-
label.ident.span,
655-
"labels on blocks are unstable"
656-
);
657-
}
658650
_ => {}
659651
}
660652
visit::walk_expr(self, e)
@@ -823,7 +815,6 @@ pub fn check_crate(krate: &ast::Crate, sess: &Session) {
823815
gate_all!(box_patterns, "box pattern syntax is experimental");
824816
gate_all!(exclusive_range_pattern, "exclusive range pattern syntax is experimental");
825817
gate_all!(try_blocks, "`try` blocks are unstable");
826-
gate_all!(label_break_value, "labels on blocks are unstable");
827818
gate_all!(box_syntax, "box expression syntax is experimental; you can call `Box::new` instead");
828819
gate_all!(type_ascription, "type ascription is experimental");
829820

compiler/rustc_codegen_cranelift/.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ task:
2222
- # Reduce amount of benchmark runs as they are slow
2323
- export COMPILE_RUNS=2
2424
- export RUN_RUNS=2
25-
- ./test.sh
25+
- ./y.rs test

compiler/rustc_codegen_cranelift/.github/workflows/main.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
# Enable extra checks
104104
export CG_CLIF_ENABLE_VERIFIER=1
105105
106-
./test.sh
106+
./y.rs test
107107
108108
- name: Package prebuilt cg_clif
109109
run: tar cvfJ cg_clif.tar.xz build
@@ -162,14 +162,14 @@ jobs:
162162
#name: Test
163163
run: |
164164
# Enable backtraces for easier debugging
165-
#export RUST_BACKTRACE=1
165+
#$Env:RUST_BACKTRACE=1
166166
167167
# Reduce amount of benchmark runs as they are slow
168-
#export COMPILE_RUNS=2
169-
#export RUN_RUNS=2
168+
#$Env:COMPILE_RUNS=2
169+
#$Env:RUN_RUNS=2
170170
171171
# Enable extra checks
172-
#export CG_CLIF_ENABLE_VERIFIER=1
172+
#$Env:CG_CLIF_ENABLE_VERIFIER=1
173173
174174
./y.exe build
175175

compiler/rustc_codegen_cranelift/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ perf.data.old
88
*.string*
99
/y.bin
1010
/y.bin.dSYM
11+
/y.exe
12+
/y.pdb
1113
/build
1214
/build_sysroot/sysroot_src
1315
/build_sysroot/compiler-builtins
@@ -17,3 +19,4 @@ perf.data.old
1719
/regex
1820
/simple-raytracer
1921
/portable-simd
22+
/abi-checker

0 commit comments

Comments
 (0)