Skip to content

Commit 9fe05e9

Browse files
committed
Auto merge of #68272 - Dylan-DPC:rollup-vrb90gu, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #67780 (Move some queries from rustc::ty to librustc_ty.) - #68096 (Clean up some diagnostics by making them more consistent) - #68223 (Use 3.6 instead of 3.5 in float fract() documentation) - #68265 (Fix some issue numbers of unstable features) - #68266 (Changed docs for f32 and f64.) Failed merges: - #68204 (Use named fields for `{ast,hir}::ItemKind::Impl`) r? @ghost
2 parents e02c475 + 90b9a62 commit 9fe05e9

File tree

110 files changed

+742
-668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+742
-668
lines changed

Cargo.lock

+12
Original file line numberDiff line numberDiff line change
@@ -3652,6 +3652,7 @@ dependencies = [
36523652
"rustc_span",
36533653
"rustc_target",
36543654
"rustc_traits",
3655+
"rustc_ty",
36553656
"rustc_typeck",
36563657
"serialize",
36573658
"smallvec 1.0.0",
@@ -3953,6 +3954,17 @@ dependencies = [
39533954
"syntax",
39543955
]
39553956

3957+
[[package]]
3958+
name = "rustc_ty"
3959+
version = "0.0.0"
3960+
dependencies = [
3961+
"log",
3962+
"rustc",
3963+
"rustc_data_structures",
3964+
"rustc_hir",
3965+
"rustc_span",
3966+
]
3967+
39563968
[[package]]
39573969
name = "rustc_typeck"
39583970
version = "0.0.0"

src/doc/unstable-book/src/language-features/infer-static-outlives-requirements.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# `infer_static_outlives_requirements`
22

3-
The tracking issue for this feature is: [#44493]
3+
The tracking issue for this feature is: [#54185]
44

5-
[#44493]: https://github.com/rust-lang/rust/issues/44493
5+
[#54185]: https://github.com/rust-lang/rust/issues/54185
66

77
------------------------
88
The `infer_static_outlives_requirements` feature indicates that certain

src/doc/unstable-book/src/language-features/member-constraints.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# `member_constraints`
22

3-
The tracking issue for this feature is: [#61977]
3+
The tracking issue for this feature is: [#61997]
44

5-
[#61977]: https://github.com/rust-lang/rust/issues/61977
5+
[#61997]: https://github.com/rust-lang/rust/issues/61997
66

77
------------------------
88

src/doc/unstable-book/src/language-features/repr128.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# `repr128`
22

3-
The tracking issue for this feature is: [#35118]
3+
The tracking issue for this feature is: [#56071]
44

5-
[#35118]: https://github.com/rust-lang/rust/issues/35118
5+
[#56071]: https://github.com/rust-lang/rust/issues/56071
66

77
------------------------
88

src/libcore/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
// Here we explicitly #[cfg]-out this whole crate when testing. If we don't do
4545
// this, both the generated test artifact and the linked libtest (which
4646
// transitively includes libcore) will both define the same set of lang items,
47-
// and this will cause the E0152 "duplicate lang item found" error. See
47+
// and this will cause the E0152 "found duplicate lang item" error. See
4848
// discussion in #50466 for details.
4949
//
5050
// This cfg won't affect doc tests.

src/librustc/middle/lang_items.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ impl LanguageItemCollector<'tcx> {
184184
self.tcx.sess,
185185
span,
186186
E0152,
187-
"duplicate lang item found: `{}`.",
187+
"found duplicate lang item `{}`",
188188
name
189189
),
190190
None => {
@@ -206,12 +206,12 @@ impl LanguageItemCollector<'tcx> {
206206
},
207207
};
208208
if let Some(span) = self.tcx.hir().span_if_local(original_def_id) {
209-
err.span_note(span, "first defined here.");
209+
err.span_note(span, "first defined here");
210210
} else {
211211
match self.tcx.extern_crate(original_def_id) {
212212
Some(ExternCrate {dependency_of, ..}) => {
213213
err.note(&format!(
214-
"first defined in crate `{}` (which `{}` depends on).",
214+
"first defined in crate `{}` (which `{}` depends on)",
215215
self.tcx.crate_name(original_def_id.krate),
216216
self.tcx.crate_name(*dependency_of)));
217217
},

src/librustc/traits/error_reporting.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
11561156
err.span_help(impl_span, "trait impl with same name found");
11571157
let trait_crate = self.tcx.crate_name(trait_with_same_path.krate);
11581158
let crate_msg = format!(
1159-
"Perhaps two different versions of crate `{}` are being used?",
1159+
"perhaps two different versions of crate `{}` are being used?",
11601160
trait_crate
11611161
);
11621162
err.note(&crate_msg);

0 commit comments

Comments
 (0)