Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e65a48e
Document WebAssembly target feature expectations
alexcrichton Aug 1, 2024
dea3846
Review comments
alexcrichton Aug 1, 2024
927633c
Add a note about libraries and `#[target_feature]`
alexcrichton Aug 1, 2024
cfe3ea6
Add new page to SUMMARY.md
alexcrichton Aug 1, 2024
ce7f1b7
Ignore two new doc blocks in testing
alexcrichton Aug 1, 2024
b6f65a4
Document on-by-default features
alexcrichton Aug 1, 2024
a5082ef
Appease tidy
alexcrichton Aug 1, 2024
06197ef
Review comments
alexcrichton Aug 2, 2024
7d2595f
Review comments
alexcrichton Aug 9, 2024
6a8ec81
Add a missing compatibility note in the 1.80.0 release notes
apiraino Aug 19, 2024
cd7cc3f
Update RELEASES.md
apiraino Aug 19, 2024
7613eee
Update RELEASES.md
apiraino Aug 19, 2024
dbad758
Stabilize feature `char_indices_offset`
eduardosm Aug 19, 2024
0a8343c
do not build `cargo-miri` by default on stable channel
onur-ozkan Aug 18, 2024
0ce7705
document `miri` and `cargo-miri` in `build.tools`
onur-ozkan Aug 18, 2024
87e4b67
Update RELEASES.md
apiraino Aug 22, 2024
6a878a9
Fix handling of macro arguments within the `dropping_copy_types lint
Urgau Aug 22, 2024
f1fac42
llvm 20: adapt integer comparison tests
krasimirgg Aug 21, 2024
8151de2
rustdoc-search: use tighter json for names and parents
notriddle Aug 22, 2024
b544603
Fix typo in help diagnostic
gurry Aug 23, 2024
2339560
kobzol vacation
Kobzol Aug 23, 2024
440076d
Rollup merge of #128511 - alexcrichton:doc-wasm-features, r=jieyouxu
GuillaumeGomez Aug 23, 2024
e5cd26a
Rollup merge of #129243 - onur-ozkan:stuff, r=Kobzol
GuillaumeGomez Aug 23, 2024
724f612
Rollup merge of #129263 - apiraino:add-missing-compat-note, r=cuviper
GuillaumeGomez Aug 23, 2024
26672c9
Rollup merge of #129276 - eduardosm:stabilize-char_indices_offset, r=…
GuillaumeGomez Aug 23, 2024
1bbb8d5
Rollup merge of #129350 - krasimirgg:llvm20, r=nikic
GuillaumeGomez Aug 23, 2024
81aca63
Rollup merge of #129408 - Urgau:macro-arg-drop_copy, r=compiler-errors
GuillaumeGomez Aug 23, 2024
db65b6c
Rollup merge of #129426 - notriddle:smaller-index-2024-08-22, r=Guill…
GuillaumeGomez Aug 23, 2024
09b3785
Rollup merge of #129437 - gurry:fix-diagnostic-typo, r=jieyouxu
GuillaumeGomez Aug 23, 2024
0369e85
Rollup merge of #129457 - Kobzol:kobzol-vacation, r=Kobzol
GuillaumeGomez Aug 23, 2024
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
StringPart::highlighted("multiple different versions".to_string()),
StringPart::normal(" of crate `".to_string()),
StringPart::highlighted(format!("{name}")),
StringPart::normal("` the your dependency graph".to_string()),
StringPart::normal("` in the dependency graph".to_string()),
],
);
let candidates = if impl_candidates.is_empty() {
Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/crate-loading/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fn main() {
| |
| required by a bound introduced by this call
|
help: there are multiple different versions of crate `dependency` the your dependency graph
help: there are multiple different versions of crate `dependency` in the dependency graph
--> multiple-dep-versions.rs:1:1
|
1 | extern crate dep_2_reexport;
Expand Down