Get rid of predicates_defined_on

[compiler-errors]

This is the uncontroversial part of #129532. This simply inlines the predicates_defined_on into into predicates_of. Nothing should change here logically.

[rustbot]

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[compiler-errors]

r? fmease or reassign

[fee1-dead]

Thanks!

r? fee1-dead

@bors r+

[bors]

📌 Commit dbf06d2 has been approved by fee1-dead

It is now in the queue for this repository.

[compiler-errors]

@bors rollup=never

probably best to test this separately given perf, and the rollup it was in jusr failed anyways

[bors]

⌛ Testing commit dbf06d2 with merge f1faeed...

[rust-log-analyzer]

The job aarch64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- [debuginfo-lldb] tests/debuginfo/basic-types-mut-globals.rs stdout ----
NOTE: compiletest thinks it is using LLDB version 1403

error: Error while running LLDB
status: signal: 11 (SIGSEGV)
command: PYTHONPATH="/Applications/Xcode_14.3.1.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python" PYTHONUNBUFFERED="1" "/usr/bin/python3" "/Users/runner/work/rust/rust/src/etc/lldb_batchmode.py" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/debuginfo/basic-types-mut-globals.lldb/a" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/debuginfo/basic-types-mut-globals.lldb/basic-types-mut-globals.debugger.script"
LLDB batch-mode script
----------------------
----------------------
Debugger commands script is '/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/debuginfo/basic-types-mut-globals.lldb/basic-types-mut-globals.debugger.script'.
Target executable is '/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/debuginfo/basic-types-mut-globals.lldb/a'.
Current working directory is '/Users/runner/work/rust/rust'
Creating a target for '/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/debuginfo/basic-types-mut-globals.lldb/a'
settings set auto-confirm true
version
version
lldb-1403.0.17.67 Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100) 
command script import /Users/runner/work/rust/rust/./src/etc/lldb_lookup.py
type synthetic add -l lldb_lookup.synthetic_lookup -x ".*" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)String$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^&(mut )?str$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^&(mut )?\\[.+\\]$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(std::ffi::([a-z_]+::)+)OsString$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)Vec<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)VecDeque<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)BTreeSet<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)BTreeMap<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(std::collections::([a-z_]+::)+)HashMap<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(std::collections::([a-z_]+::)+)HashSet<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)Rc<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(alloc::([a-z_]+::)+)Arc<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)Cell<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)Ref<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)RefMut<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)RefCell<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(core::([a-z_]+::)+)NonZero<.+>$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^core::num::([a-z_]+::)*NonZero.+$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^(std::([a-z_]+::)+)PathBuf$" --category Rust
type summary add -F lldb_lookup.summary_lookup  -e -x -h "^&(mut )?(std::([a-z_]+::)+)Path$" --category Rust
type category enable Rust
breakpoint set --file 'basic-types-mut-globals.rs' --line 98
breakpoint set --file 'basic-types-mut-globals.rs' --line 98
Breakpoint 1: where = a`basic_types_mut_globals::main::h2774469ce86d1ace + 8 at basic-types-mut-globals.rs:98:5, address = 0x0000000100003c64 
breakpoint set --file 'basic-types-mut-globals.rs' --line 118
Breakpoint 2: where = a`basic_types_mut_globals::main::h2774469ce86d1ace + 200 at basic-types-mut-globals.rs:118:5, address = 0x0000000100003d24 
------------------------------------------
stderr: none

[bors]

💔 Test failed - checks-actions

[compiler-errors]

Unrelated debugger issue

@bors retry

[bors]

⌛ Testing commit dbf06d2 with merge 8adb993...

[rust-log-analyzer]

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

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] miri test:false 4.469
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Mon, Aug 26, 2024  4:48:04 PM
  network time: Mon, 26 Aug 2024 16:48:04 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

[bors]

💔 Test failed - checks-actions

[compiler-errors]

@bors retry

[Dylan-DPC]

@bors retry

[Dylan-DPC]

@bors ping

[bors]

😪 I'm awake I'm awake

[bors]

⌛ Testing commit dbf06d2 with merge 748c548...

[bors]

☀️ Test successful - checks-actions
Approved by: fee1-dead
Pushing 748c548 to master...

[rust-timer]

Finished benchmarking commit (748c548): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.2%	[3.2%, 3.2%]	1
Improvements ✅ (primary)	-0.4%	[-1.3%, -0.2%]	108
Improvements ✅ (secondary)	-0.7%	[-2.0%, -0.1%]	68
All ❌✅ (primary)	-0.4%	[-1.3%, -0.2%]	108

Max RSS (memory usage)

Results (primary 0.1%, secondary -2.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.3%	[0.6%, 1.8%]	6
Regressions ❌ (secondary)	2.3%	[2.2%, 2.5%]	2
Improvements ✅ (primary)	-1.0%	[-1.5%, -0.6%]	6
Improvements ✅ (secondary)	-3.7%	[-6.1%, -1.3%]	7
All ❌✅ (primary)	0.1%	[-1.5%, 1.8%]	12

Cycles

Results (primary -1.7%, secondary -2.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.7%	[-2.2%, -0.9%]	3
Improvements ✅ (secondary)	-2.4%	[-3.0%, -2.0%]	16
All ❌✅ (primary)	-1.7%	[-2.2%, -0.9%]	3

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 754.016s -> 752.822s (-0.16%)
Artifact size: 338.88 MiB -> 338.90 MiB (0.01%)