Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #70016

Merged
merged 20 commits into from
Mar 15, 2020
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
54d1c50
Remove `sip::Hasher::short_write`.
nnethercote Feb 25, 2020
e1a5472
Emit 1-based column numbers in debuginfo
tmiasko Feb 21, 2020
0c51f2f
Use byte offsets when emitting debuginfo columns
tmiasko Feb 25, 2020
8e93a01
Test that column information is not emitted for MSVC targets
tmiasko Feb 25, 2020
c8b527e
change method -> associated function
mark-i-m Feb 26, 2020
b6518f0
update tests
mark-i-m Mar 5, 2020
4b46271
Remove a couple of Rc's from RegionInferenceContext
mark-i-m Mar 13, 2020
508d4a2
Remove another Rc from RegionInferenceContext
mark-i-m Mar 13, 2020
da4e33a
move frozen to rustc_data_structures
mark-i-m Mar 13, 2020
a58b17f
update rustdocs for frozen
mark-i-m Mar 13, 2020
40ffcc2
Add self to .mailmap
kraai Mar 13, 2020
47f6d63
fix E0117 message out of sync
contrun Mar 14, 2020
1c88052
Add long error explanation for E0693 #61137
Mar 14, 2020
62c0579
Rollup merge of #69357 - tmiasko:debuginfo-column, r=michaelwoerister
Dylan-DPC Mar 15, 2020
0619e46
Rollup merge of #69471 - nnethercote:rm-sip-Hasher-short_write, r=dto…
Dylan-DPC Mar 15, 2020
f40272c
Rollup merge of #69498 - mark-i-m:describe-it-2, r=matthewjasper
Dylan-DPC Mar 15, 2020
bf6e715
Rollup merge of #69967 - mark-i-m:rinfctx, r=matthewjasper
Dylan-DPC Mar 15, 2020
65f56da
Rollup merge of #69987 - kraai:mailmap, r=nikomatsakis
Dylan-DPC Mar 15, 2020
191a796
Rollup merge of #69991 - contrun:fix-69980, r=Dylan-DPC
Dylan-DPC Mar 15, 2020
838884e
Rollup merge of #69993 - ayushmishra2005:doc/61137-add-long-error-cod…
Dylan-DPC Mar 15, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/librustc_hir/def.rs
Original file line number Diff line number Diff line change
@@ -107,8 +107,7 @@ impl DefKind {
DefKind::Union => "union",
DefKind::Trait => "trait",
DefKind::ForeignTy => "foreign type",
// FIXME: Update the description to "assoc fn"
DefKind::AssocFn => "method",
DefKind::AssocFn => "associated function",
DefKind::Const => "constant",
DefKind::AssocConst => "associated constant",
DefKind::TyParam => "type parameter",
@@ -123,6 +122,7 @@ impl DefKind {
DefKind::AssocTy
| DefKind::AssocConst
| DefKind::AssocOpaqueTy
| DefKind::AssocFn
| DefKind::Enum
| DefKind::OpaqueTy => "an",
DefKind::Macro(macro_kind) => macro_kind.article(),