diff options
| author | bors <bors@rust-lang.org> | 2025-01-27 23:20:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-27 23:20:59 +0000 |
| commit | e71f9a9a98b0faf423844bf0ba7438f29dc27d58 (patch) | |
| tree | 9c54152146c4d35ca34ee55abc5e6d59ae1d81a6 /tests/run-make/crate-loading-crate-depends-on-itself/foo.stderr | |
| parent | 9fc6b43126469e3858e2fe86cafb4f0fd5068869 (diff) | |
| parent | 690f433e3e561ab79a7e9b1bc675b0109592dde6 (diff) | |
| download | rust-39e90365d9562dabea5c415e23838581e5d88ab1.tar.gz rust-39e90365d9562dabea5c415e23838581e5d88ab1.zip | |
Auto merge of #136158 - cuviper:stable-next, r=cuviper 1.84.1
[stable] Prepare Rust 1.84.1 point release - [Fix ICE 132920 in duplicate-crate diagnostics.](https://github.com/rust-lang/rust/pull/133304/) - [Fix errors for overlapping impls in incremental rebuilds.](https://github.com/rust-lang/rust/pull/133828/) - [Fix slow compilation related to the next-generation trait solver.](https://github.com/rust-lang/rust/pull/135618/) - [Fix debuginfo when LLVM's location discriminator value limit is exceeded.](https://github.com/rust-lang/rust/pull/135643/) - Fixes for building Rust from source: - [Only try to distribute `llvm-objcopy` if llvm tools are enabled.](https://github.com/rust-lang/rust/pull/134240/) - [Add Profile Override for Non-Git Sources.](https://github.com/rust-lang/rust/pull/135433/) - [Resolve symlinks of LLVM tool binaries before copying them.](https://github.com/rust-lang/rust/pull/135585/) - [Make it possible to use ci-rustc on tarball sources.](https://github.com/rust-lang/rust/pull/135722/) cc `@rust-lang/release` r? ghost
Diffstat (limited to 'tests/run-make/crate-loading-crate-depends-on-itself/foo.stderr')
| -rw-r--r-- | tests/run-make/crate-loading-crate-depends-on-itself/foo.stderr | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/run-make/crate-loading-crate-depends-on-itself/foo.stderr b/tests/run-make/crate-loading-crate-depends-on-itself/foo.stderr index 9c2fcabe5ba..36379429530 100644 --- a/tests/run-make/crate-loading-crate-depends-on-itself/foo.stderr +++ b/tests/run-make/crate-loading-crate-depends-on-itself/foo.stderr @@ -1,4 +1,4 @@ -error[E0277]: the trait bound `foo::Struct: Trait` is not satisfied because the trait comes from a different crate version +error[E0277]: the trait bound `foo::Struct: Trait` is not satisfied --> foo-current.rs:13:19 | 13 | check_trait::<foo::Struct>(); @@ -23,6 +23,11 @@ note: there are multiple different versions of crate `foo` in the dependency gra | --------------- this is the found trait = note: two types coming from two different versions of the same crate are different types even if they look the same = help: you can use `cargo tree` to explore your dependency tree +note: required by a bound in `check_trait` + --> foo-current.rs:10:19 + | +10 | fn check_trait<T: Trait>() {} + | ^^^^^ required by this bound in `check_trait` error: aborting due to 1 previous error |