Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 4 pull requests #119707

Closed
wants to merge 62 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

The Miri Conjob Bot and others added 30 commits January 5, 2024 05:06
use jemalloc as global allocator

Hopefully fixes rust-lang/miri#3255
implement the rounding intrinsics using apfloat rounding

No reason to use host floats for these. Also merge two files that were both testing various float things.
./miri build: also build tests, to avoid rebuilds later
The documentation today does not give a complete treatment of pinning
from first principles, which appropriately describes how to design types
that use it, nor does it provide formal statements of the guarantees
users need to be aware of.

This rewrite attempts to address these in a way that makes the concept
more approachable while also making the documentation more normative.
Manishearth and others added 10 commits January 7, 2024 08:56
Rewrite `pin` module documentation to clarify usage and invariants

The documentation of `pin` today does not give a complete treatment of pinning from first principles, nor does it adequately help build intuition and understanding for how the different elements of the pinning story fit together.

This rewrite attempts to address these in a way that makes the concept more approachable while also making the documentation more normative.

This PR picks up where `@mcy` left off in rust-lang#88500 (thanks to him for the original work and `@Manishearth` for mentioning it such that I originally found it). I've directly incorporated much of the feedback left on the original PR and have rewritten and changed some of the main conceits of the prose to better adhere to the feedback from the reviewers on that PR or just explain something in (hopefully) a better way.
… r=fmease

Impl trait tweaks

1. Tweak some names for `impl Trait` being used in the wrong position
2. Remove two helper functions that are no longer needed since RPITIT is stable, and which causes matches to be a bit obtuse.
3. Split and fix the part where the error notes that it's "only allowed in XX"

Fixes rust-lang#119629
…-impls, r=compiler-errors

Support `~const` in associated functions in trait impls

Fixes rust-lang#119700.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 7, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Jan 7, 2024

📌 Commit e7abeb0 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 7, 2024
@bors
Copy link
Contributor

bors commented Jan 7, 2024

⌛ Testing commit e7abeb0 with merge 6b8b798...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 7, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#116129 (Rewrite `pin` module documentation to clarify usage and invariants)
 - rust-lang#119702 (Miri subtree update)
 - rust-lang#119703 (Impl trait tweaks)
 - rust-lang#119705 (Support `~const` in associated functions in trait impls)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job dist-x86_64-illumos failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/release/build/jemalloc-sys-8ae758b2a38e21b2/build-script-build` (exit status: 101)
  --- stdout
  TARGET=x86_64-unknown-illumos
  HOST=x86_64-unknown-linux-gnu
  NUM_JOBS=8
  OUT_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out"
  BUILD_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out/build"
  SRC_DIR="/cargo/registry/src/index.crates.io-6f17d22bba15001f/jemalloc-sys-0.5.4+5.3.0-patched"
  cargo:rerun-if-env-changed=JEMALLOC_OVERRIDE
  TARGET = Some("x86_64-unknown-illumos")
  HOST = Some("x86_64-unknown-linux-gnu")
  cargo:rerun-if-env-changed=CC_x86_64-unknown-illumos
  CC_x86_64-unknown-illumos = None
---
  CFLAGS_x86_64_unknown_illumos = Some("-ffunction-sections -fdata-sections -fPIC -m64")
  cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
  CRATE_CC_NO_DEFAULTS = None
  DEBUG = Some("false")
  CARGO_CFG_TARGET_FEATURE = Some("fxsr,sse,sse2")
  CC="x86_64-illumos-gcc"
  JEMALLOC_REPO_DIR="jemalloc"
  cargo:rerun-if-env-changed=JEMALLOC_SYS_WITH_MALLOC_CONF
  cargo:rerun-if-env-changed=JEMALLOC_SYS_WITH_LG_PAGE
  cargo:rerun-if-env-changed=JEMALLOC_SYS_WITH_LG_PAGE
  cargo:rerun-if-env-changed=JEMALLOC_SYS_WITH_LG_HUGEPAGE
  cargo:rerun-if-env-changed=JEMALLOC_SYS_WITH_LG_QUANTUM
  cargo:rerun-if-env-changed=JEMALLOC_SYS_WITH_LG_VADDR
  running: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out/build" && CC="x86_64-illumos-gcc" CFLAGS="-O3 -ffunction-sections -fdata-sections -fPIC -m64 -ffunction-sections -fdata-sections -fPIC -m64" CPPFLAGS="-O3 -ffunction-sections -fdata-sections -fPIC -m64 -ffunction-sections -fdata-sections -fPIC -m64" LDFLAGS="-O3 -ffunction-sections -fdata-sections -fPIC -m64 -ffunction-sections -fdata-sections -fPIC -m64" "sh" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out/build/configure" "--disable-cxx" "--enable-doc=no" "--enable-shared=no" "--with-private-namespace=_rjem_" "--host=x86_64-unknown-illumos" "--build=x86_64-unknown-linux-gnu" "--prefix=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out"
  checking for x86_64-unknown-illumos-gcc... x86_64-illumos-gcc
  checking whether the C compiler works... yes
  checking for C compiler default output file name... a.out
  checking for suffix of executables... 
---
  checking whether compiler is cray... no
  checking whether compiler supports -std=gnu11... yes
  checking whether compiler supports -Werror=unknown-warning-option... no
  checking whether compiler supports -Wall... yes
  checking whether compiler supports -Wextra... yes
  checking whether compiler supports -Wshorten-64-to-32... no
  checking whether compiler supports -Wsign-compare... yes
  checking whether compiler supports -Wundef... yes
  checking whether compiler supports -Wno-format-zero-length... yes
  checking whether compiler supports -Wpointer-arith... yes
  checking whether compiler supports -Wno-missing-braces... yes
  checking whether compiler supports -Wno-missing-attributes... yes
  checking whether compiler supports -pipe... yes
  checking whether compiler supports -g3... yes
  checking how to run the C preprocessor... x86_64-illumos-gcc -E
---
  checking size of long... 8
  checking size of long long... 8
  checking size of intmax_t... 8
  checking build system type... x86_64-unknown-linux-gnu
  checking host system type... running: "tail" "-n" "100" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out/build/config.log"
  dvidir='${docdir}'
  enable_autogen=''
  enable_cache_oblivious=''
  enable_cxx='0'
  enable_debug=''
  enable_doc='no'
  enable_experimental_smallocx=''
  enable_fill=''
  enable_initial_exec_tls=''
  enable_lazy_lock=''
  enable_log=''
  enable_opt_safety_checks=''
  enable_opt_size_checks=''
  enable_prof=''
  enable_readlinkat=''
  enable_shared='no'
  enable_static=''
  enable_stats=''
  enable_tls=''
  enable_uaf_detection=''
  enable_utrace=''
  enable_xmalloc=''
  enable_zone_allocator=''
  exe=''
  exec_prefix='/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out'
  host='x86_64-unknown-illumos'
  host_alias='x86_64-unknown-illumos'
  host_cpu=''
  host_os=''
  host_vendor=''
  htmldir='${docdir}'
  importlib=''
  includedir='${prefix}/include'
  infodir='${datarootdir}/info'
  install_suffix=''
  je_=''
  jemalloc_version=''
  jemalloc_version_bugfix=''
  jemalloc_version_gid=''
  jemalloc_version_major=''
  jemalloc_version_minor=''
  jemalloc_version_nrev=''
  libdir='${exec_prefix}/lib'
  libdl=''
  libexecdir='${exec_prefix}/libexec'
  libprefix=''
  link_whole_archive=''
  localedir='${datarootdir}/locale'
  localstatedir='${prefix}/var'
  mandir='${datarootdir}/man'
  o=''
  objroot=''
  oldincludedir='/usr/include'
  pdfdir='${docdir}'
  prefix='/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out'
  private_namespace=''
  program_transform_name='s,x,x,'
  psdir='${docdir}'
  rev='2'
  sbindir='${exec_prefix}/sbin'
  sharedstatedir='${prefix}/com'
  so=''
  srcroot=''
  sysconfdir='${prefix}/etc'
  target_alias=''

  ## ----------- ##
  ## confdefs.h. ##
  ## ----------- ##
  /* confdefs.h */
  #define PACKAGE_NAME ""
  #define PACKAGE_TARNAME ""
  #define PACKAGE_VERSION ""
---
  #define HAVE_STDLIB_H 1
  #define HAVE_STRING_H 1
  #define HAVE_MEMORY_H 1
  #define HAVE_STRINGS_H 1
  #define HAVE_INTTYPES_H 1
  #define HAVE_STDINT_H 1
  #define HAVE_UNISTD_H 1
  #define SIZEOF_VOID_P 8
  #define LG_SIZEOF_PTR 3
  #define SIZEOF_INT 4
  #define LG_SIZEOF_INT 2
  #define SIZEOF_LONG 8
  #define LG_SIZEOF_LONG 3
  #define SIZEOF_LONG_LONG 8
  #define LG_SIZEOF_LONG_LONG 3
  #define SIZEOF_INTMAX_T 8
  #define LG_SIZEOF_INTMAX_T 3
  configure: exit 1

  --- stderr
  Invalid configuration `x86_64-unknown-illumos': OS `illumos' not recognized
  Invalid configuration `x86_64-unknown-illumos': OS `illumos' not recognized
  configure: error: /bin/bash build-aux/config.sub x86_64-unknown-illumos failed
  thread 'main' panicked at /rust/deps/jemalloc-sys-0.5.4+5.3.0-patched/build.rs:351:9:
  command did not execute successfully: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out/build" && CC="x86_64-illumos-gcc" CFLAGS="-O3 -ffunction-sections -fdata-sections -fPIC -m64 -ffunction-sections -fdata-sections -fPIC -m64" CPPFLAGS="-O3 -ffunction-sections -fdata-sections -fPIC -m64 -ffunction-sections -fdata-sections -fPIC -m64" LDFLAGS="-O3 -ffunction-sections -fdata-sections -fPIC -m64 -ffunction-sections -fdata-sections -fPIC -m64" "sh" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out/build/configure" "--disable-cxx" "--enable-doc=no" "--enable-shared=no" "--with-private-namespace=_rjem_" "--host=x86_64-unknown-illumos" "--build=x86_64-unknown-linux-gnu" "--prefix=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/x86_64-unknown-illumos/release/build/jemalloc-sys-806fece875583049/out"
  note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Build completed unsuccessfully in 0:36:00



command did not execute successfully: cd "/checkout" && env -u MAKEFLAGS -u MFLAGS AR_x86_64_unknown_illumos="x86_64-illumos-ar" CARGO_INCREMENTAL="0" CARGO_PROFILE_RELEASE_DEBUG="0" CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="false" CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="false" CARGO_PROFILE_RELEASE_STRIP="false" CARGO_TARGET_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools" CARGO_TARGET_X86_64_UNKNOWN_ILLUMOS_LINKER="x86_64-illumos-gcc" CC_x86_64_unknown_illumos="sccache x86_64-illumos-gcc" CFG_COMPILER_BUILD_TRIPLE="x86_64-unknown-linux-gnu" CFG_COMPILER_HOST_TRIPLE="x86_64-unknown-illumos" CFG_RELEASE="1.77.0-nightly" CFG_RELEASE_CHANNEL="nightly" CFG_RELEASE_NUM="1.77.0" CFG_VERSION="1.77.0-nightly (6b8b79847 2024-01-07)" CFG_VER_DATE="2024-01-07" CFG_VER_HASH="6b8b7984758c6d4d2493bb6bac3fd46a4560c25b" CFG_VIRTUAL_RUST_SOURCE_BASE_DIR="/rustc/6b8b7984758c6d4d2493bb6bac3fd46a4560c25b" CFLAGS_x86_64_unknown_illumos="-ffunction-sections -fdata-sections -fPIC -m64" CXXFLAGS_x86_64_unknown_illumos="-ffunction-sections -fdata-sections -fPIC -m64" CXX_x86_64_unknown_illumos="sccache x86_64-illumos-g++" DOC_RUST_LANG_ORG_CHANNEL="https://doc.rust-lang.org/nightly" LIBC_CHECK_CFG="1" LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/lib" LIBZ_SYS_STATIC="1" LZMA_API_STATIC="1" RANLIB_x86_64_unknown_illumos="x86_64-illumos-ar s" REAL_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" RUSTBUILD_NATIVE_DIR="/checkout/obj/build/x86_64-unknown-illumos/native" RUSTC="/checkout/obj/build/bootstrap/debug/rustc" RUSTC_BOOTSTRAP="1" RUSTC_BREAK_ON_ICE="1" RUSTC_CARGO_REGISTRY_SRC_TO_REMAP="/cargo/registry/src/index.crates.io-6f17d22bba15001f=/rust/deps" RUSTC_DEBUGINFO_MAP="/checkout=/rustc/6b8b7984758c6d4d2493bb6bac3fd46a4560c25b" RUSTC_ERROR_METADATA_DST="/checkout/obj/build/tmp/extended-error-metadata" RUSTC_HOST_FLAGS="-Zunstable-options --check-cfg=cfg(bootstrap)" RUSTC_INSTALL_BINDIR="bin" RUSTC_LIBDIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib" RUSTC_LINT_FLAGS="-Wrust_2018_idioms -Wunused_lifetimes -Dwarnings" RUSTC_PRINT_STEP_TIMINGS="1" RUSTC_REAL="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" RUSTC_SNAPSHOT="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" RUSTC_SNAPSHOT_LIBDIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib" RUSTC_STAGE="1" RUSTC_SYSROOT="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1" RUSTC_TLS_MODEL_INITIAL_EXEC="1" RUSTC_VERBOSE="0" RUSTC_WRAPPER="/checkout/obj/build/bootstrap/debug/rustc" RUSTDOC="/checkout/obj/build/bootstrap/debug/rustdoc" RUSTDOCFLAGS="--cfg=windows_raw_dylib -Csymbol-mangling-version=v0 -Zunstable-options --check-cfg=cfg(bootstrap) --check-cfg=cfg(parallel_compiler) --check-cfg=cfg(rust_analyzer) --check-cfg=cfg(no_btreemap_remove_entry) --check-cfg=cfg(crossbeam_loom) --check-cfg=cfg(span_locations) --check-cfg=cfg(rustix_use_libc) --check-cfg=cfg(emulate_second_only_system) --check-cfg=cfg(windows_raw_dylib) -Clinker=x86_64-illumos-gcc -Dwarnings -Wrustdoc::invalid_codeblock_attributes --crate-version 1.77.0-nightly\t(6b8b79847\t2024-01-07)" RUSTDOC_REAL="/path/to/nowhere/rustdoc/not/required" RUSTFLAGS="--cfg=windows_raw_dylib -Csymbol-mangling-version=v0 -Zunstable-options --check-cfg=cfg(bootstrap) --check-cfg=cfg(parallel_compiler) --check-cfg=cfg(rust_analyzer) --check-cfg=cfg(no_btreemap_remove_entry) --check-cfg=cfg(crossbeam_loom) --check-cfg=cfg(span_locations) --check-cfg=cfg(rustix_use_libc) --check-cfg=cfg(emulate_second_only_system) --check-cfg=cfg(windows_raw_dylib) -Zdual-proc-macros -Zmacro-backtrace -Clink-args=-Wl,-z,origin -Clink-args=-Wl,-rpath,$ORIGIN/../lib -Zunstable-options -Csplit-debuginfo=off -Zunstable-options" RUST_TEST_THREADS="8" SYSROOT="/checkout/obj/build/x86_64-unknown-linux-gnu/stage1" TERM="xterm" __CARGO_DEFAULT_LIB_METADATA="nightlytool-rustc" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-illumos" "--release" "-Zcheck-cfg" "-Zdual-proc-macros" "-Zbinary-dep-depinfo" "-j" "8" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/miri/Cargo.toml"

stdout ----

stderr ----

@bors
Copy link
Contributor

bors commented Jan 7, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 7, 2024
bors added a commit to rust-lang/miri that referenced this pull request Jan 8, 2024
only use jemalloc on Linux and macOS

hopefully fixes [this](rust-lang/rust#119707 (comment))
RalfJung pushed a commit to RalfJung/rust that referenced this pull request Jan 8, 2024
only use jemalloc on Linux and macOS

hopefully fixes [this](rust-lang#119707 (comment))
@matthiaskrgr matthiaskrgr deleted the rollup-xtmhz8p branch March 16, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants