Skip to content

Commit 14863ea

Browse files
borsbors
committed
Auto merge of #142242 - matthiaskrgr:rollup-1sgx0ji, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #129121 (Stabilize `tcp_quickack`) - #142192 (De-duplicate f16 & f128 doctest attributes) - #142193 (add tests for pattern binding drop order edge cases) - #142222 (Dont make `ObligationCtxt`s with diagnostics unnecessarily) - #142228 (rustc-dev-guide subtree update) - #142231 (Run `calculate_matrix` job on `master` to cache citool builds) - #142232 (add `Cargo.lock` to CI-rustc allowed list for non-CI env) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7c10378 + 8daa8ef commit 14863ea

File tree

37 files changed

+540
-494
lines changed

37 files changed

+540
-494
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ name: CI
1111
on:
1212
push:
1313
branches:
14+
# CI on master only serves for caching citool builds for the `calculate_matrix` job.
15+
# In order to use GHA cache on PR CI (and auto/try) jobs, we need to write to it
16+
# from the default branch.
17+
- master
1418
- auto
1519
- try
1620
- try-perf

‎compiler/rustc_const_eval/src/check_consts/check.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
395395
}
396396

397397
let (infcx, param_env) = tcx.infer_ctxt().build_with_typing_env(self.body.typing_env(tcx));
398-
let ocx = ObligationCtxt::new_with_diagnostics(&infcx);
398+
let ocx = ObligationCtxt::new(&infcx);
399399

400400
let body_id = self.body.source.def_id().expect_local();
401401
let host_polarity = match self.const_kind() {

‎compiler/rustc_ty_utils/src/ty.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ fn impl_self_is_guaranteed_unsized<'tcx>(tcx: TyCtxt<'tcx>, impl_def_id: DefId)
319319

320320
let infcx = tcx.infer_ctxt().ignoring_regions().build(ty::TypingMode::non_body_analysis());
321321

322-
let ocx = traits::ObligationCtxt::new_with_diagnostics(&infcx);
322+
let ocx = traits::ObligationCtxt::new(&infcx);
323323
let cause = traits::ObligationCause::dummy();
324324
let param_env = tcx.param_env(impl_def_id);
325325

‎library/core/src/num/f128.rs‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,7 @@ impl f128 {
14221422
// due to https://github.com/llvm/llvm-project/issues/44744. aarch64 linux matches this.
14231423
// #[unstable(feature = "core_float_math", issue = "137578")]
14241424
#[cfg(not(test))]
1425+
#[doc(test(attr(feature(cfg_target_has_reliable_f16_f128), expect(internal_features))))]
14251426
impl f128 {
14261427
/// Returns the largest integer less than or equal to `self`.
14271428
///
@@ -1431,8 +1432,6 @@ impl f128 {
14311432
///
14321433
/// ```
14331434
/// #![feature(f128)]
1434-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1435-
/// # #![expect(internal_features)]
14361435
/// # #[cfg(not(miri))]
14371436
/// # #[cfg(target_has_reliable_f128_math)] {
14381437
///
@@ -1464,8 +1463,6 @@ impl f128 {
14641463
///
14651464
/// ```
14661465
/// #![feature(f128)]
1467-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1468-
/// # #![expect(internal_features)]
14691466
/// # #[cfg(not(miri))]
14701467
/// # #[cfg(target_has_reliable_f128_math)] {
14711468
///
@@ -1497,8 +1494,6 @@ impl f128 {
14971494
///
14981495
/// ```
14991496
/// #![feature(f128)]
1500-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1501-
/// # #![expect(internal_features)]
15021497
/// # #[cfg(not(miri))]
15031498
/// # #[cfg(target_has_reliable_f128_math)] {
15041499
///
@@ -1535,8 +1530,6 @@ impl f128 {
15351530
///
15361531
/// ```
15371532
/// #![feature(f128)]
1538-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1539-
/// # #![expect(internal_features)]
15401533
/// # #[cfg(not(miri))]
15411534
/// # #[cfg(target_has_reliable_f128_math)] {
15421535
///
@@ -1570,8 +1563,6 @@ impl f128 {
15701563
///
15711564
/// ```
15721565
/// #![feature(f128)]
1573-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1574-
/// # #![expect(internal_features)]
15751566
/// # #[cfg(not(miri))]
15761567
/// # #[cfg(target_has_reliable_f128_math)] {
15771568
///
@@ -1604,8 +1595,6 @@ impl f128 {
16041595
///
16051596
/// ```
16061597
/// #![feature(f128)]
1607-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1608-
/// # #![expect(internal_features)]
16091598
/// # #[cfg(not(miri))]
16101599
/// # #[cfg(target_has_reliable_f128_math)] {
16111600
///
@@ -1646,8 +1635,6 @@ impl f128 {
16461635
///
16471636
/// ```
16481637
/// #![feature(f128)]
1649-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1650-
/// # #![expect(internal_features)]
16511638
/// # #[cfg(not(miri))]
16521639
/// # #[cfg(target_has_reliable_f128_math)] {
16531640
///
@@ -1694,8 +1681,6 @@ impl f128 {
16941681
///
16951682
/// ```
16961683
/// #![feature(f128)]
1697-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1698-
/// # #![expect(internal_features)]
16991684
/// # #[cfg(not(miri))]
17001685
/// # #[cfg(target_has_reliable_f128_math)] {
17011686
///
@@ -1739,8 +1724,6 @@ impl f128 {
17391724
///
17401725
/// ```
17411726
/// #![feature(f128)]
1742-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1743-
/// # #![expect(internal_features)]
17441727
/// # #[cfg(not(miri))]
17451728
/// # #[cfg(target_has_reliable_f128_math)] {
17461729
///
@@ -1779,8 +1762,6 @@ impl f128 {
17791762
///
17801763
/// ```
17811764
/// #![feature(f128)]
1782-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1783-
/// # #![expect(internal_features)]
17841765
/// # #[cfg(not(miri))]
17851766
/// # #[cfg(target_has_reliable_f128_math)] {
17861767
///
@@ -1814,8 +1795,6 @@ impl f128 {
18141795
///
18151796
/// ```
18161797
/// #![feature(f128)]
1817-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1818-
/// # #![expect(internal_features)]
18191798
/// # #[cfg(not(miri))]
18201799
/// # #[cfg(target_has_reliable_f128_math)] {
18211800
///

‎library/core/src/num/f16.rs‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,6 +1398,7 @@ impl f16 {
13981398
// Functions in this module fall into `core_float_math`
13991399
// #[unstable(feature = "core_float_math", issue = "137578")]
14001400
#[cfg(not(test))]
1401+
#[doc(test(attr(feature(cfg_target_has_reliable_f16_f128), expect(internal_features))))]
14011402
impl f16 {
14021403
/// Returns the largest integer less than or equal to `self`.
14031404
///
@@ -1407,8 +1408,6 @@ impl f16 {
14071408
///
14081409
/// ```
14091410
/// #![feature(f16)]
1410-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1411-
/// # #![expect(internal_features)]
14121411
/// # #[cfg(not(miri))]
14131412
/// # #[cfg(target_has_reliable_f16_math)] {
14141413
///
@@ -1440,8 +1439,6 @@ impl f16 {
14401439
///
14411440
/// ```
14421441
/// #![feature(f16)]
1443-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1444-
/// # #![expect(internal_features)]
14451442
/// # #[cfg(not(miri))]
14461443
/// # #[cfg(target_has_reliable_f16_math)] {
14471444
///
@@ -1473,8 +1470,6 @@ impl f16 {
14731470
///
14741471
/// ```
14751472
/// #![feature(f16)]
1476-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1477-
/// # #![expect(internal_features)]
14781473
/// # #[cfg(not(miri))]
14791474
/// # #[cfg(target_has_reliable_f16_math)] {
14801475
///
@@ -1511,8 +1506,6 @@ impl f16 {
15111506
///
15121507
/// ```
15131508
/// #![feature(f16)]
1514-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1515-
/// # #![expect(internal_features)]
15161509
/// # #[cfg(not(miri))]
15171510
/// # #[cfg(target_has_reliable_f16_math)] {
15181511
///
@@ -1546,8 +1539,6 @@ impl f16 {
15461539
///
15471540
/// ```
15481541
/// #![feature(f16)]
1549-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1550-
/// # #![expect(internal_features)]
15511542
/// # #[cfg(not(miri))]
15521543
/// # #[cfg(target_has_reliable_f16_math)] {
15531544
///
@@ -1580,8 +1571,6 @@ impl f16 {
15801571
///
15811572
/// ```
15821573
/// #![feature(f16)]
1583-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1584-
/// # #![expect(internal_features)]
15851574
/// # #[cfg(not(miri))]
15861575
/// # #[cfg(target_has_reliable_f16_math)] {
15871576
///
@@ -1622,8 +1611,6 @@ impl f16 {
16221611
///
16231612
/// ```
16241613
/// #![feature(f16)]
1625-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1626-
/// # #![expect(internal_features)]
16271614
/// # #[cfg(not(miri))]
16281615
/// # #[cfg(target_has_reliable_f16_math)] {
16291616
///
@@ -1670,8 +1657,6 @@ impl f16 {
16701657
///
16711658
/// ```
16721659
/// #![feature(f16)]
1673-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1674-
/// # #![expect(internal_features)]
16751660
/// # #[cfg(not(miri))]
16761661
/// # #[cfg(target_has_reliable_f16_math)] {
16771662
///
@@ -1715,8 +1700,6 @@ impl f16 {
17151700
///
17161701
/// ```
17171702
/// #![feature(f16)]
1718-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1719-
/// # #![expect(internal_features)]
17201703
/// # #[cfg(not(miri))]
17211704
/// # #[cfg(target_has_reliable_f16_math)] {
17221705
///
@@ -1755,8 +1738,6 @@ impl f16 {
17551738
///
17561739
/// ```
17571740
/// #![feature(f16)]
1758-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1759-
/// # #![expect(internal_features)]
17601741
/// # #[cfg(not(miri))]
17611742
/// # #[cfg(target_has_reliable_f16_math)] {
17621743
///
@@ -1790,8 +1771,6 @@ impl f16 {
17901771
///
17911772
/// ```
17921773
/// #![feature(f16)]
1793-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1794-
/// # #![expect(internal_features)]
17951774
/// # #[cfg(not(miri))]
17961775
/// # #[cfg(target_has_reliable_f16_math)] {
17971776
///
@@ -1828,8 +1807,6 @@ impl f16 {
18281807
///
18291808
/// ```
18301809
/// #![feature(f16)]
1831-
/// # #![feature(cfg_target_has_reliable_f16_f128)]
1832-
/// # #![expect(internal_features)]
18331810
/// # #[cfg(not(miri))]
18341811
/// # #[cfg(target_has_reliable_f16_math)] {
18351812
///

0 commit comments

Comments
 (0)