Skip to content

Commit a71ec16

Browse files
borsbors
committed
Auto merge of rust-lang#145077 - Zalathar:rollup-0k4194x, r=Zalathar
Rollup of 19 pull requests Successful merges: - rust-lang#144400 (`tests/ui/issues/`: The Issues Strike Back [3/N]) - rust-lang#144764 ([codegen] assume the tag, not the relative discriminant) - rust-lang#144807 (Streamline config in bootstrap) - rust-lang#144899 (Print CGU reuse statistics in `-Zprint-mono-items`) - rust-lang#144909 (Add new `test::print_merged_doctests_times` used by rustdoc to display more detailed time information) - rust-lang#144912 (Resolver: introduce a conditionally mutable Resolver for (non-)speculative resolution.) - rust-lang#144914 (Add support for `ty::Instance` path shortening in diagnostics) - rust-lang#144931 ([win][arm64ec] Fix msvc-wholearchive for Arm64EC) - rust-lang#144999 (coverage: Remove all unstable support for MC/DC instrumentation) - rust-lang#145009 (A couple small changes for rust-analyzer next-solver work) - rust-lang#145030 (GVN: Do not flatten derefs with ProjectionElem::Index. ) - rust-lang#145042 (stdarch subtree update) - rust-lang#145047 (move `type_check` out of `compute_regions`) - rust-lang#145051 (Prevent name collisions with internal implementation details) - rust-lang#145053 (Add a lot of NLL `known-bug` tests) - rust-lang#145055 (Move metadata symbol export from exported_non_generic_symbols to exported_symbols) - rust-lang#145057 (Clean up some resolved test regressions of const trait removals in std) - rust-lang#145068 (Readd myself to review queue) - rust-lang#145070 (Add minimal `armv7a-vex-v5` tier three target) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e3a4f68 + 420e225 commit a71ec16

File tree

42 files changed

+5347
-5012
lines changed

Some content is hidden

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

42 files changed

+5347
-5012
lines changed

‎coretests/tests/char.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ fn test_convert() {
2121
assert!(char::try_from(0xFFFF_FFFF_u32).is_err());
2222
}
2323

24-
/* FIXME(#110395)
2524
#[test]
2625
const fn test_convert_const() {
2726
assert!(u32::from('a') == 0x61);
@@ -31,7 +30,6 @@ const fn test_convert_const() {
3130
assert!(char::from(b'a') == 'a');
3231
assert!(char::from(b'\xFF') == '\u{FF}');
3332
}
34-
*/
3533

3634
#[test]
3735
fn test_from_str() {

‎coretests/tests/convert.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* FIXME(#110395)
21
#[test]
32
fn convert() {
43
const fn from(x: i32) -> i32 {
@@ -15,4 +14,3 @@ fn convert() {
1514
const BAR: Vec<String> = into(Vec::new());
1615
assert_eq!(BAR, Vec::<String>::new());
1716
}
18-
*/

‎coretests/tests/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
#![feature(const_deref)]
1919
#![feature(const_destruct)]
2020
#![feature(const_eval_select)]
21+
#![feature(const_from)]
2122
#![feature(const_ops)]
23+
#![feature(const_option_ops)]
2224
#![feature(const_ref_cell)]
2325
#![feature(const_result_trait_fn)]
2426
#![feature(const_trait_impl)]

‎coretests/tests/nonzero.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,11 @@ fn nonzero_const() {
214214
const ONE: Option<NonZero<u8>> = NonZero::new(1);
215215
assert!(ONE.is_some());
216216

217-
/* FIXME(#110395)
218217
const FROM_NONZERO_U8: u8 = u8::from(NONZERO_U8);
219218
assert_eq!(FROM_NONZERO_U8, 5);
220219

221220
const NONZERO_CONVERT: NonZero<u32> = NonZero::<u32>::from(NONZERO_U8);
222221
assert_eq!(NONZERO_CONVERT.get(), 5);
223-
*/
224222
}
225223

226224
#[test]

‎coretests/tests/num/const_from.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* FIXME(#110395)
21
#[test]
32
fn from() {
43
use core::convert::TryFrom;
@@ -24,4 +23,3 @@ fn from() {
2423
const I16_FROM_U16: Result<i16, TryFromIntError> = i16::try_from(1u16);
2524
assert_eq!(I16_FROM_U16, Ok(1i16));
2625
}
27-
*/

‎coretests/tests/option.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ fn test_and() {
8787
assert_eq!(x.and(Some(2)), None);
8888
assert_eq!(x.and(None::<isize>), None);
8989

90-
/* FIXME(#110395)
9190
const FOO: Option<isize> = Some(1);
9291
const A: Option<isize> = FOO.and(Some(2));
9392
const B: Option<isize> = FOO.and(None);
@@ -99,7 +98,6 @@ fn test_and() {
9998
const D: Option<isize> = BAR.and(None);
10099
assert_eq!(C, None);
101100
assert_eq!(D, None);
102-
*/
103101
}
104102

105103
#[test]

‎stdarch/.github/workflows/rustc-pull.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ jobs:
1212
if: github.repository == 'rust-lang/stdarch'
1313
uses: rust-lang/josh-sync/.github/workflows/rustc-pull.yml@main
1414
with:
15+
github-app-id: ${{ vars.APP_CLIENT_ID }}
1516
# https://rust-lang.zulipchat.com/#narrow/channel/208962-t-libs.2Fstdarch/topic/Subtree.20sync.20automation/with/528461782
1617
zulip-stream-id: 208962
1718
zulip-bot-email: "[email protected]"
1819
pr-base-branch: master
1920
branch-name: rustc-pull
2021
secrets:
2122
zulip-api-token: ${{ secrets.ZULIP_API_TOKEN }}
22-
token: ${{ secrets.GITHUB_TOKEN }}
23+
github-app-secret: ${{ secrets.APP_PRIVATE_KEY }}

‎stdarch/Cargo.lock

Lines changed: 32 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎stdarch/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt-get update && \
66
gcc-loongarch64-linux-gnu libc6-dev-loong64-cross
77

88

9-
ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER=loongarch64-linux-gnu-gcc-14 \
9+
ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER=loongarch64-linux-gnu-gcc \
1010
CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-loongarch64-static -cpu max -L /usr/loongarch64-linux-gnu" \
1111
OBJDUMP=loongarch64-linux-gnu-objdump \
1212
STDARCH_TEST_SKIP_FEATURE=frecipe

0 commit comments

Comments
 (0)