Remove another instance of the param-env hack

rust-lang · Oct 12, 2023 · 639c30c · 639c30c
1 parent b89a545
commit 639c30c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/compiler/rustc_trait_selection/src/traits/select/mod.rs b/compiler/rustc_trait_selection/src/traits/select/mod.rs
@@ -1049,17 +1049,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
         previous_stack: TraitObligationStackList<'o, 'tcx>,
         mut obligation: PolyTraitObligation<'tcx>,
     ) -> Result<EvaluationResult, OverflowError> {
-        if !self.is_intercrate()
-            && obligation.is_global()
-            && obligation.param_env.caller_bounds().iter().all(|bound| bound.has_param())
-        {
-            // If a param env has no global bounds, global obligations do not
-            // depend on its particular value in order to work, so we can clear
-            // out the param env and get better caching.
-            debug!("in global");
-            obligation.param_env = obligation.param_env.without_caller_bounds();
-        }
-
         let stack = self.push_stack(previous_stack, &obligation);
         let fresh_trait_pred = stack.fresh_trait_pred;
         let param_env = obligation.param_env;

diff --git a/src/doc/reference b/src/doc/reference
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
diff --git a/src/tools/cargo b/src/tools/cargo
+2 −2		src/attributes.md
+5 −41		src/behavior-considered-undefined.md
+2 −2		src/SUMMARY.md
+3 −29		src/attribute.md
+1 −1		src/custom_types/constants.md
+18 −16		src/flow_control/while_let.md
+1 −1		src/fn/hof.md
+3 −6		src/meta/doc.md
+4 −11		src/meta/playground.md
+1 −1		src/scope/lifetime.md
+1 −1		src/scope/move.md
+0 −3		src/std_misc/arg/matching.md
+4 −2		src/std_misc/file/read_lines.md
+5 −35		.github/renovate.json5
+5 −5		.github/workflows/main.yml
+2 −213		CHANGELOG.md
+15 −28		Cargo.lock
+7 −8		Cargo.toml
+1 −2		crates/cargo-platform/Cargo.toml
+0 −1		crates/cargo-test-support/src/compare.rs
+0 −48		crates/cargo-test-support/src/lib.rs
+2 −2		crates/cargo-util/Cargo.toml
+1 −1		crates/crates-io/Cargo.toml
+0 −4		crates/crates-io/lib.rs
+0 −1		crates/home/Cargo.toml
+17 −4		crates/xtask-bump-check/src/xtask.rs
+1 −2		credential/cargo-credential-1password/Cargo.toml
+1 −2		credential/cargo-credential-libsecret/Cargo.toml
+1 −2		credential/cargo-credential-macos-keychain/Cargo.toml
+1 −2		credential/cargo-credential-wincred/Cargo.toml
+2 −2		credential/cargo-credential/Cargo.toml
+9 −23		src/bin/cargo/cli.rs
+8 −1		src/bin/cargo/commands/build.rs
+0 −8		src/cargo/core/compiler/context/mod.rs
+3 −7		src/cargo/core/compiler/future_incompat.rs
+1 −1		src/cargo/core/compiler/layout.rs
+6 −19		src/cargo/core/features.rs
+3 −8		src/cargo/core/package.rs
+15 −19		src/cargo/core/package_id.rs
+1 −4		src/cargo/ops/cargo_add/mod.rs
+1 −4		src/cargo/ops/cargo_generate_lockfile.rs
+3 −39		src/cargo/ops/cargo_install.rs
+2 −3		src/cargo/ops/cargo_package.rs
+0 −1		src/cargo/ops/cargo_uninstall.rs
+8 −60		src/cargo/ops/common_for_install_and_uninstall.rs
+3 −3		src/cargo/ops/lockfile.rs
+1 −2		src/cargo/ops/registry/mod.rs
+1 −2		src/cargo/ops/registry/publish.rs
+1 −4		src/cargo/ops/resolve.rs
+1 −4		src/cargo/sources/git/source.rs
+3 −4		src/cargo/sources/registry/download.rs
+1 −4		src/cargo/sources/registry/http_remote.rs
+1 −2		src/cargo/sources/registry/index.rs
+1 −4		src/cargo/sources/registry/mod.rs
+4 −11		src/cargo/sources/registry/remote.rs
+0 −549		src/cargo/util/cache_lock.rs
+0 −21		src/cargo/util/command_prelude.rs
+85 −36		src/cargo/util/config/mod.rs
+104 −183		src/cargo/util/flock.rs
+0 −1		src/cargo/util/mod.rs
+2,486 −2,488		src/cargo/util/toml/mod.rs
+1 −1		src/cargo/util/toml/targets.rs
+1 −1		src/doc/man/generated_txt/cargo-init.txt
+1 −1		src/doc/man/generated_txt/cargo-new.txt
+1 −1		src/doc/man/includes/options-new.md
+1 −1		src/doc/src/commands/cargo-init.md
+1 −1		src/doc/src/commands/cargo-new.md
+1 −1		src/doc/src/reference/publishing.md
+0 −27		src/doc/src/reference/unstable.md
+1 −1		src/etc/man/cargo-init.1
+1 −1		src/etc/man/cargo-new.1
+1 −51		tests/testsuite/build.rs
+0 −304		tests/testsuite/cache_lock.rs
+1 −1		tests/testsuite/cargo_init/help/stdout.log
+1 −1		tests/testsuite/cargo_new/help/stdout.log
+5 −28		tests/testsuite/config.rs
+2 −2		tests/testsuite/doc.rs
+0 −20		tests/testsuite/install.rs
+0 −1		tests/testsuite/main.rs
+0 −23		tests/testsuite/out_dir.rs
+2 −2		tests/testsuite/package.rs
+3 −5		tests/testsuite/rustdocflags.rs
+1 −4		tests/testsuite/search.rs