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 15 pull requests #41965

Merged
merged 36 commits into from
May 13, 2017
Merged
Changes from 2 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3acfa81
bootstrap: openssl android support
malbarbo May 5, 2017
cf05cd8
bootstrap: Output name of failed config in case of errors
devurandom May 7, 2017
defcfb2
Remove wrong or outdated info from CString docs.
mbrubeck May 9, 2017
67d762d
Refactor suggestion diagnostic API to allow for multiple suggestions
oli-obk May 9, 2017
e2f781c
Example usage of multiple suggestions
oli-obk May 10, 2017
9d51d6b
Fix tidy issues
oli-obk May 10, 2017
f859f25
Update a compile-fail test
oli-obk May 10, 2017
e42875c
doc: break into 2 sentences
tshepang May 11, 2017
644ce5e
Address PR reviews
oli-obk May 11, 2017
43349e6
Upgrade some comments to doc comments
oli-obk May 11, 2017
641d053
Fix typo in size_hint example comment
mglagla May 11, 2017
084b67f
Annotate the license exceptions
brson May 11, 2017
75b69c4
Fix search when looking to sources
GuillaumeGomez May 11, 2017
68c1ce9
rustc_trans: do not attempt to truncate an i1 const to i1.
eddyb May 11, 2017
80891f6
Remove some unused macros from the rust codebase
est31 May 12, 2017
a54bbf2
Weave the span of an import through the resolve code
oli-obk May 12, 2017
3f2bbe3
Don't use a DUMMY_SP for reporting issues with crate imports
oli-obk May 12, 2017
b47aa1b
config.toml.example: add note that optimize = false won't speed up a …
est31 May 12, 2017
7a03b4c
Fix unexpected panic with the -Z treat-err-as-bug option
tommyip May 12, 2017
26e7e49
rustdoc: Break words in the location box of the sidebar.
Eijebong May 12, 2017
99bca6e
Add tidy check to detect empty files
iKevinY May 12, 2017
88a5af7
Rollup merge of #41820 - devurandom:patch-1, r=alexcrichton
Mark-Simulacrum May 13, 2017
2519e90
Rollup merge of #41860 - mbrubeck:docs, r=nagisa
Mark-Simulacrum May 13, 2017
1f72662
Rollup merge of #41876 - oli-obk:diagnosing_diagnostics, r=nagisa
Mark-Simulacrum May 13, 2017
605d727
Rollup merge of #41896 - tshepang:too-long, r=steveklabnik
Mark-Simulacrum May 13, 2017
8b62560
Rollup merge of #41912 - oli-obk:patch-3, r=eddyb
Mark-Simulacrum May 13, 2017
82c3163
Rollup merge of #41916 - mglagla:typo, r=sfackler
Mark-Simulacrum May 13, 2017
cde12ee
Rollup merge of #41918 - brson:lic, r=alexcrichton
Mark-Simulacrum May 13, 2017
ee1c102
Rollup merge of #41921 - GuillaumeGomez:fix-search-style, r=steveklabnik
Mark-Simulacrum May 13, 2017
cf4fac6
Rollup merge of #41923 - eddyb:issue-41744, r=arielb1
Mark-Simulacrum May 13, 2017
f6bf99a
Rollup merge of #41934 - est31:remove_unused_macros, r=nagisa
Mark-Simulacrum May 13, 2017
ac02b64
Rollup merge of #41935 - iKevinY:detect-empty-files, r=Mark-Simulacrum
Mark-Simulacrum May 13, 2017
6e29059
Rollup merge of #41940 - est31:master, r=eddyb
Mark-Simulacrum May 13, 2017
c17811c
Rollup merge of #41942 - tommyip:master, r=Mark-Simulacrum
Mark-Simulacrum May 13, 2017
7b1e51d
Rollup merge of #41943 - malbarbo:android-openssl, r=alexcrichton
Mark-Simulacrum May 13, 2017
f28e3cd
Rollup merge of #41951 - Eijebong:master, r=GuillaumeGomez
Mark-Simulacrum May 13, 2017
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
2 changes: 1 addition & 1 deletion src/bootstrap/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ impl Config {
let table = match p.parse() {
Some(table) => table,
None => {
println!("failed to parse TOML configuration:");
println!("failed to parse TOML configuration '{}':", file.to_str().unwrap());
for err in p.errors.iter() {
let (loline, locol) = p.to_linecol(err.lo);
let (hiline, hicol) = p.to_linecol(err.hi);
Expand Down