Skip to content

Commit

Permalink
Auto merge of #68272 - Dylan-DPC:rollup-vrb90gu, r=Dylan-DPC
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Jan 16, 2020
2 parents e02c475 + 90b9a62 commit 9fe05e9
Show file tree
Hide file tree
Showing 110 changed files with 742 additions and 668 deletions.
12 changes: 12 additions & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3652,6 +3652,7 @@ dependencies = [
"rustc_span",
"rustc_target",
"rustc_traits",
"rustc_ty",
"rustc_typeck",
"serialize",
"smallvec 1.0.0",
Expand Down Expand Up @@ -3953,6 +3954,17 @@ dependencies = [
"syntax",
]

[[package]]
name = "rustc_ty"
version = "0.0.0"
dependencies = [
"log",
"rustc",
"rustc_data_structures",
"rustc_hir",
"rustc_span",
]

[[package]]
name = "rustc_typeck"
version = "0.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# `infer_static_outlives_requirements`

The tracking issue for this feature is: [#44493]
The tracking issue for this feature is: [#54185]

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

------------------------
The `infer_static_outlives_requirements` feature indicates that certain
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# `member_constraints`

The tracking issue for this feature is: [#61977]
The tracking issue for this feature is: [#61997]

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

------------------------

Expand Down
4 changes: 2 additions & 2 deletions src/doc/unstable-book/src/language-features/repr128.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# `repr128`

The tracking issue for this feature is: [#35118]
The tracking issue for this feature is: [#56071]

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

------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/libcore/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
// Here we explicitly #[cfg]-out this whole crate when testing. If we don't do
// this, both the generated test artifact and the linked libtest (which
// transitively includes libcore) will both define the same set of lang items,
// and this will cause the E0152 "duplicate lang item found" error. See
// and this will cause the E0152 "found duplicate lang item" error. See
// discussion in #50466 for details.
//
// This cfg won't affect doc tests.
Expand Down
6 changes: 3 additions & 3 deletions src/librustc/middle/lang_items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ impl LanguageItemCollector<'tcx> {
self.tcx.sess,
span,
E0152,
"duplicate lang item found: `{}`.",
"found duplicate lang item `{}`",
name
),
None => {
Expand All @@ -206,12 +206,12 @@ impl LanguageItemCollector<'tcx> {
},
};
if let Some(span) = self.tcx.hir().span_if_local(original_def_id) {
err.span_note(span, "first defined here.");
err.span_note(span, "first defined here");
} else {
match self.tcx.extern_crate(original_def_id) {
Some(ExternCrate {dependency_of, ..}) => {
err.note(&format!(
"first defined in crate `{}` (which `{}` depends on).",
"first defined in crate `{}` (which `{}` depends on)",
self.tcx.crate_name(original_def_id.krate),
self.tcx.crate_name(*dependency_of)));
},
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/traits/error_reporting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
err.span_help(impl_span, "trait impl with same name found");
let trait_crate = self.tcx.crate_name(trait_with_same_path.krate);
let crate_msg = format!(
"Perhaps two different versions of crate `{}` are being used?",
"perhaps two different versions of crate `{}` are being used?",
trait_crate
);
err.note(&crate_msg);
Expand Down
Loading

0 comments on commit 9fe05e9

Please sign in to comment.