Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 10 pull requests #64246

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.

Sign up for GitHub

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

Merged
merged 34 commits into from
Sep 7, 2019
Merged

Rollup of 10 pull requests #64246

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6876f9b
filter linkcheck spurious failure
mark-i-m Aug 26, 2019
2e59c4a
fix bugs + review comments
mark-i-m Aug 29, 2019
3f6db84
actually compiles now?
mark-i-m Aug 30, 2019
0133941
Add an ExpnKind for AST passes
matthewjasper Aug 25, 2019
4082cd9
Allow ast passes to create hygienic spans
matthewjasper Aug 25, 2019
6fcdb36
Make use of hygiene in AST passes
matthewjasper Aug 25, 2019
2a82aec
Move tests for unit tests to their own directory
matthewjasper Aug 25, 2019
beb2f5b
Remove `Ident::{gensym, is_gensymed}`
matthewjasper Aug 25, 2019
846df20
Fix 2018 edition expanded pretty printing
matthewjasper Aug 25, 2019
0b86782
Don't call `diag_span_note_once` for suppressed lints
matthewjasper Aug 27, 2019
c8cf9f5
Add `with_{def_site,call_site,legacy}_ctxt,` methods to `Span`
petrochenkov Aug 28, 2019
e552840
Document test harness generation
matthewjasper Aug 28, 2019
afcf9b2
Bail out when encountering likely missing turbofish in parser
estebank Sep 5, 2019
3f3fc52
Simplify std lib injection
matthewjasper Sep 5, 2019
bad8147
fix reviewer comments
mark-i-m Sep 5, 2019
dc613c6
Fix test
estebank Sep 5, 2019
eedf555
rustc_codegen_llvm: give names to non-alloca variable values.
eddyb Sep 4, 2019
10f46b6
Move the HIR cfg to `rustc_ast_borrowck`
matthewjasper Sep 6, 2019
f6481ed
Correct pluralisation of various diagnostic messages
varkor Sep 6, 2019
0b97726
Update ui tests
varkor Sep 6, 2019
055d379
reduce visibility
matklad Aug 31, 2019
a26ee85
Include compiler-rt in the source tarball
maurer Sep 6, 2019
7dd5c66
Added more prereqs and note about default directory
Sep 6, 2019
3dde650
Move injection of attributes from command line to `libsyntax_ext`
petrochenkov Sep 6, 2019
db493ef
Rollup merge of #63919 - matthewjasper:remove-gensymmed, r=petrochenkov
Centril Sep 7, 2019
7dcac19
Rollup merge of #63927 - mark-i-m:filter-spurious, r=ehuss
Centril Sep 7, 2019
da61325
Rollup merge of #64149 - eddyb:llvm-var-names, r=rkruppe
Centril Sep 7, 2019
fae7bc7
Rollup merge of #64192 - estebank:turbofish-madness, r=petrochenkov
Centril Sep 7, 2019
84cb352
Rollup merge of #64231 - matthewjasper:move-ast-cfg, r=Centril
Centril Sep 7, 2019
d5caeac
Rollup merge of #64233 - varkor:correct-pluralisation, r=estebank
Centril Sep 7, 2019
e6a7689
Rollup merge of #64236 - matklad:reduce-visibility, r=Centril
Centril Sep 7, 2019
e77ba6f
Rollup merge of #64240 - maurer:include-compiler-rt, r=alexcrichton
Centril Sep 7, 2019
69121f5
Rollup merge of #64241 - adityaatluri:install-doc, r=Mark-Simulacrum
Centril Sep 7, 2019
3d4cb50
Rollup merge of #64243 - petrochenkov:cmdattr, r=alexcrichton
Centril Sep 7, 2019
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
fix reviewer comments
  • Loading branch information
@mark-i-m
mark-i-m committed Sep 5, 2019
commit bad8147d01df374e3daa37fe36446781df2eac2d
66 changes: 33 additions & 33 deletions src/tools/rustbook/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use clap::{App, AppSettings, ArgMatches, SubCommand};
use mdbook::errors::Result as Result3;
use mdbook::MDBook;

#[cfg(feature = "linkcheck")]
use failure::Error;
#[cfg(feature = "linkcheck")]
use mdbook::renderer::RenderContext;
Expand Down Expand Up @@ -52,36 +53,41 @@ fn main() {
}
}
("linkcheck", Some(sub_matches)) => {
if let Err(err) = linkcheck(sub_matches) {
eprintln!("Error: {}", err);

// HACK: ignore timeouts
let actually_broken = {
#[cfg(feature = "linkcheck")]
{
err.downcast::<BrokenLinks>()
.map(|broken_links| {
broken_links
.links()
.iter()
.inspect(|cause| eprintln!("\tCaused By: {}", cause))
.any(|cause| !format!("{}", cause).contains("timed out"))
})
.unwrap_or(false)
}

#[cfg(not(feature = "linkcheck"))]
{
false
#[cfg(feature = "linkcheck")]
{
if let Err(err) = linkcheck(sub_matches) {
eprintln!("Error: {}", err);

// HACK: ignore timeouts
let actually_broken = err
.downcast::<BrokenLinks>()
.map(|broken_links| {
broken_links
.links()
.iter()
.inspect(|cause| eprintln!("\tCaused By: {}", cause))
.fold(false, |already_broken, cause| {
already_broken || !format!("{}", cause).contains("timed out")
})
})
.unwrap_or(false);

if actually_broken {
std::process::exit(101);
} else {
std::process::exit(0);
}
};

if actually_broken {
std::process::exit(101);
} else {
std::process::exit(0);
}
}

#[cfg(not(feature = "linkcheck"))]
{
// This avoids the `unused_binding` lint.
println!(
"mdbook-linkcheck is disabled, but arguments were passed: {:?}",
sub_matches
);
}
}
(_, _) => unreachable!(),
};
Expand All @@ -97,12 +103,6 @@ pub fn linkcheck(args: &ArgMatches<'_>) -> Result<(), Error> {
mdbook_linkcheck::check_links(&render_ctx)
}

#[cfg(not(feature = "linkcheck"))]
pub fn linkcheck(_args: &ArgMatches<'_>) -> Result<(), Error> {
println!("mdbook-linkcheck is disabled.");
Ok(())
}

// Build command implementation
pub fn build(args: &ArgMatches<'_>) -> Result3<()> {
let book_dir = get_book_dir(args);
Expand Down