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 9 pull requests #30929

Merged
merged 22 commits into from
Jan 15, 2016
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2195302
Instant/SystemTime doc: add meaning to first line
SimonSapin Dec 28, 2015
6780e3e
Fixes #30628 by adding new snapshot for dragonfly bsd
Jan 8, 2016
8e2b4b2
Update wording of Instant and SystemTime docs
SimonSapin Jan 12, 2016
2593794
Revamp the "future incompatible" section to clarify the situation
nikomatsakis Jan 8, 2016
7098cfd
Fix test cases accordingly
nikomatsakis Jan 12, 2016
f9b5463
Fix long line in URL
nikomatsakis Jan 12, 2016
0254f69
use fileline_ and not full span_ for the followon messages
nikomatsakis Jan 13, 2016
b372910
Add powerpc64 and powerpc64le support
antonblanchard Dec 28, 2015
7ff64b2
Incorrect getrandom() system call for PowerPC Linux
antonblanchard Jan 8, 2016
12aec07
Simplify some uses of cfg in test cases
antonblanchard Jan 13, 2016
5580b90
s/HARD ERROR/hard error/ -- perhaps the warning is enough
nikomatsakis Jan 13, 2016
0704279
improve use of `,` vs `;`
nikomatsakis Jan 13, 2016
b1d8554
update blksize_t in raw to reflect libc change under openbsd
semarie Jan 14, 2016
a353490
resolve: Remove record_exports, fixes #4953
jseyfried Jan 12, 2016
52786de
Clarify what a crate is, within the "Getting Started" chapter.
Jan 12, 2016
ad83ea6
Rollup merge of #30591 - SimonSapin:patch-15, r=aturon
Manishearth Jan 15, 2016
7208d25
Rollup merge of #30776 - antonblanchard:powerpc64_merge, r=alexcrichton
Manishearth Jan 15, 2016
8637da8
Rollup merge of #30781 - dhuseby:add_dragonflybsd_snapshot_3391630, r…
Manishearth Jan 15, 2016
56cae9f
Rollup merge of #30787 - nikomatsakis:future-incompatible-lint, r=brson
Manishearth Jan 15, 2016
d9d902e
Rollup merge of #30836 - Luke-Nukem:master, r=steveklabnik
Manishearth Jan 15, 2016
22cbdd4
Rollup merge of #30864 - jseyfried:no_record_exports, r=nrc
Manishearth Jan 15, 2016
4f8d584
Rollup merge of #30925 - semarie:blksize_t, r=alexcrichton
Manishearth Jan 15, 2016
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
Prev Previous commit
Next Next commit
improve use of , vs ;
  • Loading branch information
nikomatsakis committed Jan 13, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 0704279dd366d09f107014027647a64f8bfefed9
4 changes: 2 additions & 2 deletions src/librustc/lint/context.rs
Original file line number Diff line number Diff line change
@@ -446,8 +446,8 @@ pub fn raw_struct_lint<'a>(sess: &'a Session,
// Check for future incompatibility lints and issue a stronger warning.
if let Some(future_incompatible) = lints.future_incompatible(LintId::of(lint)) {
let explanation = format!("this was previously accepted by the compiler \
but is being phased out, \
and will become a hard error in a future release!");
but is being phased out; \
it will become a hard error in a future release!");
let citation = format!("for more information, see {}",
future_incompatible.reference);
if let Some(sp) = span {