2014-04-04 01:03:01 -05:00
|
|
|
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
|
2013-12-22 13:23:04 -06:00
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
std: Stabilize library APIs for 1.5
This commit stabilizes and deprecates library APIs whose FCP has closed in the
last cycle, specifically:
Stabilized APIs:
* `fs::canonicalize`
* `Path::{metadata, symlink_metadata, canonicalize, read_link, read_dir, exists,
is_file, is_dir}` - all moved to inherent methods from the `PathExt` trait.
* `Formatter::fill`
* `Formatter::width`
* `Formatter::precision`
* `Formatter::sign_plus`
* `Formatter::sign_minus`
* `Formatter::alternate`
* `Formatter::sign_aware_zero_pad`
* `string::ParseError`
* `Utf8Error::valid_up_to`
* `Iterator::{cmp, partial_cmp, eq, ne, lt, le, gt, ge}`
* `<[T]>::split_{first,last}{,_mut}`
* `Condvar::wait_timeout` - note that `wait_timeout_ms` is not yet deprecated
but will be once 1.5 is released.
* `str::{R,}MatchIndices`
* `str::{r,}match_indices`
* `char::from_u32_unchecked`
* `VecDeque::insert`
* `VecDeque::shrink_to_fit`
* `VecDeque::as_slices`
* `VecDeque::as_mut_slices`
* `VecDeque::swap_remove_front` - (renamed from `swap_front_remove`)
* `VecDeque::swap_remove_back` - (renamed from `swap_back_remove`)
* `Vec::resize`
* `str::slice_mut_unchecked`
* `FileTypeExt`
* `FileTypeExt::{is_block_device, is_char_device, is_fifo, is_socket}`
* `BinaryHeap::from` - `from_vec` deprecated in favor of this
* `BinaryHeap::into_vec` - plus a `Into` impl
* `BinaryHeap::into_sorted_vec`
Deprecated APIs
* `slice::ref_slice`
* `slice::mut_ref_slice`
* `iter::{range_inclusive, RangeInclusive}`
* `std::dynamic_lib`
Closes #27706
Closes #27725
cc #27726 (align not stabilized yet)
Closes #27734
Closes #27737
Closes #27742
Closes #27743
Closes #27772
Closes #27774
Closes #27777
Closes #27781
cc #27788 (a few remaining methods though)
Closes #27790
Closes #27793
Closes #27796
Closes #27810
cc #28147 (not all parts stabilized)
2015-10-22 18:28:45 -05:00
|
|
|
#![allow(deprecated)]
|
|
|
|
|
2015-04-13 18:23:32 -05:00
|
|
|
use std::cell::{RefCell, Cell};
|
2015-02-26 23:00:43 -06:00
|
|
|
use std::collections::{HashSet, HashMap};
|
2014-06-11 21:33:52 -05:00
|
|
|
use std::dynamic_lib::DynamicLibrary;
|
2015-02-26 23:00:43 -06:00
|
|
|
use std::env;
|
|
|
|
use std::ffi::OsString;
|
2015-03-11 17:24:14 -05:00
|
|
|
use std::io::prelude::*;
|
2015-02-26 23:00:43 -06:00
|
|
|
use std::io;
|
|
|
|
use std::path::PathBuf;
|
|
|
|
use std::process::Command;
|
2015-11-22 13:02:04 -06:00
|
|
|
use std::rc::Rc;
|
2013-12-22 13:23:04 -06:00
|
|
|
use std::str;
|
2015-03-11 17:24:14 -05:00
|
|
|
use std::sync::{Arc, Mutex};
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-02-13 19:49:11 -06:00
|
|
|
use testing;
|
2015-02-25 05:44:44 -06:00
|
|
|
use rustc_lint;
|
2015-09-02 15:11:32 -05:00
|
|
|
use rustc::front::map as hir_map;
|
2015-01-03 21:42:21 -06:00
|
|
|
use rustc::session::{self, config};
|
2015-09-30 12:08:37 -05:00
|
|
|
use rustc::session::config::{get_unstable_features_setting, OutputType};
|
2014-12-16 16:32:02 -06:00
|
|
|
use rustc::session::search_paths::{SearchPaths, PathKind};
|
2015-09-28 19:18:05 -05:00
|
|
|
use rustc_front::lowering::{lower_crate, LoweringContext};
|
std: Stabilize the `fs` module
This commit performs a stabilization pass over the `std::fs` module now that
it's had some time to bake. The change was largely just adding `#[stable]` tags,
but there are a few APIs that remain `#[unstable]`.
The following apis are now marked `#[stable]`:
* `std::fs` (the name)
* `File`
* `Metadata`
* `ReadDir`
* `DirEntry`
* `OpenOptions`
* `Permissions`
* `File::{open, create}`
* `File::{sync_all, sync_data}`
* `File::set_len`
* `File::metadata`
* Trait implementations for `File` and `&File`
* `OpenOptions::new`
* `OpenOptions::{read, write, append, truncate, create}`
* `OpenOptions::open` - this function was modified, however, to not attempt to
reject cross-platform openings of directories. This means that some platforms
will succeed in opening a directory and others will fail.
* `Metadata::{is_dir, is_file, len, permissions}`
* `Permissions::{readonly, set_readonly}`
* `Iterator for ReadDir`
* `DirEntry::path`
* `remove_file` - like with `OpenOptions::open`, the extra windows code to
remove a readonly file has been removed. This means that removing a readonly
file will succeed on some platforms but fail on others.
* `metadata`
* `rename`
* `copy`
* `hard_link`
* `soft_link`
* `read_link`
* `create_dir`
* `create_dir_all`
* `remove_dir`
* `remove_dir_all`
* `read_dir`
The following apis remain `#[unstable]`.
* `WalkDir` and `walk` - there are many methods by which a directory walk can be
constructed, and it's unclear whether the current semantics are the right
ones. For example symlinks are not handled super well currently. This is now
behind a new `fs_walk` feature.
* `File::path` - this is an extra abstraction which the standard library
provides on top of what the system offers and it's unclear whether we should
be doing so. This is now behind a new `file_path` feature.
* `Metadata::{accessed, modified}` - we do not currently have a good
abstraction for a moment in time which is what these APIs should likely be
returning, so these remain `#[unstable]` for now. These are now behind a new
`fs_time` feature
* `set_file_times` - like with `Metadata::accessed`, we do not currently have
the appropriate abstraction for the arguments here so this API remains
unstable behind the `fs_time` feature gate.
* `PathExt` - the precise set of methods on this trait may change over time and
some methods may be removed. This API remains unstable behind the `path_ext`
feature gate.
* `set_permissions` - we may wish to expose a more granular ability to set the
permissions on a file instead of just a blanket "set all permissions" method.
This function remains behind the `fs` feature.
The following apis are now `#[deprecated]`
* The `TempDir` type is now entirely deprecated and is [located on
crates.io][tempdir] as the `tempdir` crate with [its source][github] at
rust-lang/tempdir.
[tempdir]: https://crates.io/crates/tempdir
[github]: https://github.com/rust-lang/tempdir
The stability of some of these APIs has been questioned over the past few weeks
in using these APIs, and it is intentional that the majority of APIs here are
marked `#[stable]`. The `std::fs` module has a lot of room to grow and the
material is [being tracked in a RFC issue][rfc-issue].
[rfc-issue]: https://github.com/rust-lang/rfcs/issues/939
[breaking-change]
2015-03-03 21:18:29 -06:00
|
|
|
use rustc_back::tempdir::TempDir;
|
2015-02-02 18:40:52 -06:00
|
|
|
use rustc_driver::{driver, Compilation};
|
2015-11-24 17:23:22 -06:00
|
|
|
use rustc_metadata::cstore::CStore;
|
2015-02-09 22:42:31 -06:00
|
|
|
use syntax::codemap::CodeMap;
|
2015-12-13 16:17:55 -06:00
|
|
|
use syntax::errors;
|
|
|
|
use syntax::errors::emitter::ColorConfig;
|
2015-11-22 13:02:04 -06:00
|
|
|
use syntax::parse::token;
|
2013-12-22 13:23:04 -06:00
|
|
|
|
|
|
|
use core;
|
|
|
|
use clean;
|
|
|
|
use clean::Clean;
|
|
|
|
use fold::DocFolder;
|
|
|
|
use html::markdown;
|
|
|
|
use passes;
|
|
|
|
use visit_ast::RustdocVisitor;
|
|
|
|
|
2015-04-06 20:39:39 -05:00
|
|
|
#[derive(Clone, Default)]
|
|
|
|
pub struct TestOptions {
|
|
|
|
pub no_crate_inject: bool,
|
|
|
|
pub attrs: Vec<String>,
|
|
|
|
}
|
|
|
|
|
2014-05-05 20:56:44 -05:00
|
|
|
pub fn run(input: &str,
|
2014-05-22 18:57:53 -05:00
|
|
|
cfgs: Vec<String>,
|
2014-12-16 16:32:02 -06:00
|
|
|
libs: SearchPaths,
|
2014-07-20 01:02:14 -05:00
|
|
|
externs: core::Externs,
|
2014-07-31 22:14:59 -05:00
|
|
|
mut test_args: Vec<String>,
|
|
|
|
crate_name: Option<String>)
|
2015-03-25 19:06:52 -05:00
|
|
|
-> isize {
|
2015-03-18 11:14:54 -05:00
|
|
|
let input_path = PathBuf::from(input);
|
2014-11-27 06:21:26 -06:00
|
|
|
let input = config::Input::File(input_path.clone());
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-05-06 06:38:01 -05:00
|
|
|
let sessopts = config::Options {
|
2015-02-26 23:00:43 -06:00
|
|
|
maybe_sysroot: Some(env::current_exe().unwrap().parent().unwrap()
|
|
|
|
.parent().unwrap().to_path_buf()),
|
2014-12-16 16:32:02 -06:00
|
|
|
search_paths: libs.clone(),
|
2014-05-06 06:38:01 -05:00
|
|
|
crate_types: vec!(config::CrateTypeDylib),
|
2014-07-20 01:02:14 -05:00
|
|
|
externs: externs.clone(),
|
Preliminary feature staging
This partially implements the feature staging described in the
[release channel RFC][rc]. It does not yet fully conform to the RFC as
written, but does accomplish its goals sufficiently for the 1.0 alpha
release.
It has three primary user-visible effects:
* On the nightly channel, use of unstable APIs generates a warning.
* On the beta channel, use of unstable APIs generates a warning.
* On the beta channel, use of feature gates generates a warning.
Code that does not trigger these warnings is considered 'stable',
modulo pre-1.0 bugs.
Disabling the warnings for unstable APIs continues to be done in the
existing (i.e. old) style, via `#[allow(...)]`, not that specified in
the RFC. I deem this marginally acceptable since any code that must do
this is not using the stable dialect of Rust.
Use of feature gates is itself gated with the new 'unstable_features'
lint, on nightly set to 'allow', and on beta 'warn'.
The attribute scheme used here corresponds to an older version of the
RFC, with the `#[staged_api]` crate attribute toggling the staging
behavior of the stability attributes, but the user impact is only
in-tree so I'm not concerned about having to make design changes later
(and I may ultimately prefer the scheme here after all, with the
`#[staged_api]` crate attribute).
Since the Rust codebase itself makes use of unstable features the
compiler and build system to a midly elaborate dance to allow it to
bootstrap while disobeying these lints (which would otherwise be
errors because Rust builds with `-D warnings`).
This patch includes one significant hack that causes a
regression. Because the `format_args!` macro emits calls to unstable
APIs it would trigger the lint. I added a hack to the lint to make it
not trigger, but this in turn causes arguments to `println!` not to be
checked for feature gates. I don't presently understand macro
expansion well enough to fix. This is bug #20661.
Closes #16678
[rc]: https://github.com/rust-lang/rfcs/blob/master/text/0507-release-channels.md
2015-01-06 08:26:08 -06:00
|
|
|
unstable_features: get_unstable_features_setting(),
|
2014-05-06 06:38:01 -05:00
|
|
|
..config::basic_options().clone()
|
2013-12-22 13:23:04 -06:00
|
|
|
};
|
|
|
|
|
2015-12-13 16:17:55 -06:00
|
|
|
let codemap = Rc::new(CodeMap::new());
|
|
|
|
let diagnostic_handler = errors::Handler::new(ColorConfig::Auto,
|
|
|
|
None,
|
|
|
|
true,
|
|
|
|
false,
|
|
|
|
codemap.clone());
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2015-11-22 13:02:04 -06:00
|
|
|
let cstore = Rc::new(CStore::new(token::get_ident_interner()));
|
|
|
|
let cstore_ = ::rustc_driver::cstore_to_cratestore(cstore.clone());
|
2014-05-06 06:38:01 -05:00
|
|
|
let sess = session::build_session_(sessopts,
|
2015-11-22 13:02:04 -06:00
|
|
|
Some(input_path.clone()),
|
2015-12-13 16:17:55 -06:00
|
|
|
diagnostic_handler,
|
|
|
|
codemap,
|
2015-11-22 13:02:04 -06:00
|
|
|
cstore_);
|
2015-02-25 05:44:44 -06:00
|
|
|
rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-05-06 06:38:01 -05:00
|
|
|
let mut cfg = config::build_configuration(&sess);
|
2015-12-15 03:03:55 -06:00
|
|
|
cfg.extend(config::parse_cfgspecs(cfgs.clone()));
|
2014-03-05 08:36:01 -06:00
|
|
|
let krate = driver::phase_1_parse_input(&sess, cfg, &input);
|
2015-11-22 13:02:04 -06:00
|
|
|
let krate = driver::phase_2_configure_and_expand(&sess, &cstore, krate,
|
2014-05-18 08:56:13 -05:00
|
|
|
"rustdoc-test", None)
|
2014-06-10 16:03:19 -05:00
|
|
|
.expect("phase_2_configure_and_expand aborted in rustdoc!");
|
2015-07-31 02:04:06 -05:00
|
|
|
let krate = driver::assign_node_ids(&sess, krate);
|
2015-10-05 21:31:43 -05:00
|
|
|
let lcx = LoweringContext::new(&sess, Some(&krate));
|
2015-09-28 19:18:05 -05:00
|
|
|
let krate = lower_crate(&lcx, &krate);
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2015-04-06 20:39:39 -05:00
|
|
|
let opts = scrape_test_config(&krate);
|
2015-03-15 19:54:30 -05:00
|
|
|
|
2015-09-02 15:11:32 -05:00
|
|
|
let mut forest = hir_map::Forest::new(krate);
|
|
|
|
let map = hir_map::map_crate(&mut forest);
|
|
|
|
|
2014-09-06 11:13:40 -05:00
|
|
|
let ctx = core::DocContext {
|
2015-09-02 15:11:32 -05:00
|
|
|
map: &map,
|
2015-09-28 19:18:05 -05:00
|
|
|
maybe_typed: core::NotTyped(&sess),
|
2015-01-17 23:02:31 -06:00
|
|
|
input: input,
|
2014-05-09 15:52:17 -05:00
|
|
|
external_paths: RefCell::new(Some(HashMap::new())),
|
2014-05-03 04:08:58 -05:00
|
|
|
external_traits: RefCell::new(None),
|
|
|
|
external_typarams: RefCell::new(None),
|
2014-05-26 23:51:59 -05:00
|
|
|
inlined: RefCell::new(None),
|
2014-05-29 03:35:44 -05:00
|
|
|
populated_crate_impls: RefCell::new(HashSet::new()),
|
2015-04-13 18:23:32 -05:00
|
|
|
deref_trait_did: Cell::new(None),
|
2013-12-22 13:23:04 -06:00
|
|
|
};
|
|
|
|
|
2014-09-06 11:13:40 -05:00
|
|
|
let mut v = RustdocVisitor::new(&ctx, None);
|
2015-09-02 15:11:32 -05:00
|
|
|
v.visit(ctx.map.krate());
|
2014-09-06 11:13:40 -05:00
|
|
|
let mut krate = v.clean(&ctx);
|
2014-07-31 22:14:59 -05:00
|
|
|
match crate_name {
|
|
|
|
Some(name) => krate.name = name,
|
|
|
|
None => {}
|
|
|
|
}
|
2014-02-05 15:15:24 -06:00
|
|
|
let (krate, _) = passes::collapse_docs(krate);
|
2014-06-18 03:04:35 -05:00
|
|
|
let (krate, _) = passes::unindent_comments(krate);
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-05-25 05:17:19 -05:00
|
|
|
let mut collector = Collector::new(krate.name.to_string(),
|
2015-12-15 03:03:55 -06:00
|
|
|
cfgs,
|
2014-03-05 17:28:08 -06:00
|
|
|
libs,
|
2014-07-20 01:02:14 -05:00
|
|
|
externs,
|
2015-03-15 19:54:30 -05:00
|
|
|
false,
|
2015-04-06 20:39:39 -05:00
|
|
|
opts);
|
2014-02-05 15:15:24 -06:00
|
|
|
collector.fold_crate(krate);
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-07-14 15:54:10 -05:00
|
|
|
test_args.insert(0, "rustdoctest".to_string());
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2015-02-01 20:53:25 -06:00
|
|
|
testing::test_main(&test_args,
|
2014-09-14 22:27:36 -05:00
|
|
|
collector.tests.into_iter().collect());
|
2013-12-22 13:23:04 -06:00
|
|
|
0
|
|
|
|
}
|
|
|
|
|
2015-03-15 19:54:30 -05:00
|
|
|
// Look for #![doc(test(no_crate_inject))], used by crates in the std facade
|
2015-07-31 02:04:06 -05:00
|
|
|
fn scrape_test_config(krate: &::rustc_front::hir::Crate) -> TestOptions {
|
2015-09-14 04:58:20 -05:00
|
|
|
use syntax::attr::AttrMetaMethods;
|
|
|
|
use syntax::print::pprust;
|
2015-03-15 19:54:30 -05:00
|
|
|
|
2015-04-06 20:39:39 -05:00
|
|
|
let mut opts = TestOptions {
|
2015-04-07 22:11:59 -05:00
|
|
|
no_crate_inject: false,
|
2015-04-06 20:39:39 -05:00
|
|
|
attrs: Vec::new(),
|
|
|
|
};
|
|
|
|
|
2015-06-10 11:22:20 -05:00
|
|
|
let attrs = krate.attrs.iter()
|
|
|
|
.filter(|a| a.check_name("doc"))
|
2015-04-06 20:39:39 -05:00
|
|
|
.filter_map(|a| a.meta_item_list())
|
2015-06-10 11:22:20 -05:00
|
|
|
.flat_map(|l| l)
|
2015-04-06 20:39:39 -05:00
|
|
|
.filter(|a| a.check_name("test"))
|
|
|
|
.filter_map(|a| a.meta_item_list())
|
2015-06-10 11:22:20 -05:00
|
|
|
.flat_map(|l| l);
|
2015-04-06 20:39:39 -05:00
|
|
|
for attr in attrs {
|
|
|
|
if attr.check_name("no_crate_inject") {
|
|
|
|
opts.no_crate_inject = true;
|
|
|
|
}
|
|
|
|
if attr.check_name("attr") {
|
|
|
|
if let Some(l) = attr.meta_item_list() {
|
|
|
|
for item in l {
|
|
|
|
opts.attrs.push(pprust::meta_item_to_string(item));
|
2015-03-15 19:54:30 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-06 20:39:39 -05:00
|
|
|
return opts;
|
2015-03-15 19:54:30 -05:00
|
|
|
}
|
|
|
|
|
2015-12-15 03:03:55 -06:00
|
|
|
fn runtest(test: &str, cratename: &str, cfgs: Vec<String>, libs: SearchPaths,
|
2014-12-16 16:32:02 -06:00
|
|
|
externs: core::Externs,
|
2015-03-15 19:54:30 -05:00
|
|
|
should_panic: bool, no_run: bool, as_test_harness: bool,
|
2015-04-06 20:39:39 -05:00
|
|
|
opts: &TestOptions) {
|
2014-06-19 08:11:18 -05:00
|
|
|
// the test harness wants its own `main` & top level functions, so
|
|
|
|
// never wrap the test in `fn main() { ... }`
|
2015-04-06 20:39:39 -05:00
|
|
|
let test = maketest(test, Some(cratename), as_test_harness, opts);
|
2014-11-27 06:21:26 -06:00
|
|
|
let input = config::Input::Str(test.to_string());
|
2015-09-30 12:08:37 -05:00
|
|
|
let mut outputs = HashMap::new();
|
|
|
|
outputs.insert(OutputType::Exe, None);
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-05-06 06:38:01 -05:00
|
|
|
let sessopts = config::Options {
|
2015-02-26 23:00:43 -06:00
|
|
|
maybe_sysroot: Some(env::current_exe().unwrap().parent().unwrap()
|
|
|
|
.parent().unwrap().to_path_buf()),
|
2014-12-16 16:32:02 -06:00
|
|
|
search_paths: libs,
|
2014-05-06 06:38:01 -05:00
|
|
|
crate_types: vec!(config::CrateTypeExecutable),
|
2015-09-30 12:08:37 -05:00
|
|
|
output_types: outputs,
|
2014-07-20 01:02:14 -05:00
|
|
|
externs: externs,
|
2014-05-06 06:38:01 -05:00
|
|
|
cg: config::CodegenOptions {
|
2014-02-06 21:57:09 -06:00
|
|
|
prefer_dynamic: true,
|
2014-05-06 06:38:01 -05:00
|
|
|
.. config::basic_codegen_options()
|
2014-02-06 21:57:09 -06:00
|
|
|
},
|
2014-06-19 08:11:18 -05:00
|
|
|
test: as_test_harness,
|
Preliminary feature staging
This partially implements the feature staging described in the
[release channel RFC][rc]. It does not yet fully conform to the RFC as
written, but does accomplish its goals sufficiently for the 1.0 alpha
release.
It has three primary user-visible effects:
* On the nightly channel, use of unstable APIs generates a warning.
* On the beta channel, use of unstable APIs generates a warning.
* On the beta channel, use of feature gates generates a warning.
Code that does not trigger these warnings is considered 'stable',
modulo pre-1.0 bugs.
Disabling the warnings for unstable APIs continues to be done in the
existing (i.e. old) style, via `#[allow(...)]`, not that specified in
the RFC. I deem this marginally acceptable since any code that must do
this is not using the stable dialect of Rust.
Use of feature gates is itself gated with the new 'unstable_features'
lint, on nightly set to 'allow', and on beta 'warn'.
The attribute scheme used here corresponds to an older version of the
RFC, with the `#[staged_api]` crate attribute toggling the staging
behavior of the stability attributes, but the user impact is only
in-tree so I'm not concerned about having to make design changes later
(and I may ultimately prefer the scheme here after all, with the
`#[staged_api]` crate attribute).
Since the Rust codebase itself makes use of unstable features the
compiler and build system to a midly elaborate dance to allow it to
bootstrap while disobeying these lints (which would otherwise be
errors because Rust builds with `-D warnings`).
This patch includes one significant hack that causes a
regression. Because the `format_args!` macro emits calls to unstable
APIs it would trigger the lint. I added a hack to the lint to make it
not trigger, but this in turn causes arguments to `println!` not to be
checked for feature gates. I don't presently understand macro
expansion well enough to fix. This is bug #20661.
Closes #16678
[rc]: https://github.com/rust-lang/rfcs/blob/master/text/0507-release-channels.md
2015-01-06 08:26:08 -06:00
|
|
|
unstable_features: get_unstable_features_setting(),
|
2014-05-06 06:38:01 -05:00
|
|
|
..config::basic_options().clone()
|
2013-12-22 13:23:04 -06:00
|
|
|
};
|
|
|
|
|
2014-02-28 14:33:49 -06:00
|
|
|
// Shuffle around a few input and output handles here. We're going to pass
|
|
|
|
// an explicit handle into rustc to collect output messages, but we also
|
|
|
|
// want to catch the error message that rustc prints when it fails.
|
|
|
|
//
|
2015-05-08 10:12:29 -05:00
|
|
|
// We take our thread-local stderr (likely set by the test runner) and replace
|
2015-03-11 17:24:14 -05:00
|
|
|
// it with a sink that is also passed to rustc itself. When this function
|
2015-05-08 10:12:29 -05:00
|
|
|
// returns the output of the sink is copied onto the output of our own thread.
|
2014-02-28 14:33:49 -06:00
|
|
|
//
|
2015-05-13 15:00:17 -05:00
|
|
|
// The basic idea is to not use a default Handler for rustc, and then also
|
2014-02-28 14:33:49 -06:00
|
|
|
// not print things by default to the actual stderr.
|
2015-03-11 17:24:14 -05:00
|
|
|
struct Sink(Arc<Mutex<Vec<u8>>>);
|
|
|
|
impl Write for Sink {
|
|
|
|
fn write(&mut self, data: &[u8]) -> io::Result<usize> {
|
|
|
|
Write::write(&mut *self.0.lock().unwrap(), data)
|
|
|
|
}
|
|
|
|
fn flush(&mut self) -> io::Result<()> { Ok(()) }
|
|
|
|
}
|
|
|
|
struct Bomb(Arc<Mutex<Vec<u8>>>, Box<Write+Send>);
|
|
|
|
impl Drop for Bomb {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
let _ = self.1.write_all(&self.0.lock().unwrap());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let data = Arc::new(Mutex::new(Vec::new()));
|
2015-12-13 16:17:55 -06:00
|
|
|
let codemap = Rc::new(CodeMap::new());
|
|
|
|
let emitter = errors::emitter::EmitterWriter::new(box Sink(data.clone()), None, codemap.clone());
|
2015-03-11 17:24:14 -05:00
|
|
|
let old = io::set_panic(box Sink(data.clone()));
|
|
|
|
let _bomb = Bomb(data, old.unwrap_or(box io::stdout()));
|
2014-02-28 14:33:49 -06:00
|
|
|
|
|
|
|
// Compile the code
|
2015-12-13 16:17:55 -06:00
|
|
|
let diagnostic_handler = errors::Handler::with_emitter(true, false, box emitter);
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2015-11-22 13:02:04 -06:00
|
|
|
let cstore = Rc::new(CStore::new(token::get_ident_interner()));
|
|
|
|
let cstore_ = ::rustc_driver::cstore_to_cratestore(cstore.clone());
|
2014-05-06 06:38:01 -05:00
|
|
|
let sess = session::build_session_(sessopts,
|
2015-01-10 20:03:34 -06:00
|
|
|
None,
|
2015-12-13 16:17:55 -06:00
|
|
|
diagnostic_handler,
|
|
|
|
codemap,
|
2015-11-22 13:02:04 -06:00
|
|
|
cstore_);
|
2015-02-25 05:44:44 -06:00
|
|
|
rustc_lint::register_builtins(&mut sess.lint_store.borrow_mut(), Some(&sess));
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-08-30 07:12:47 -05:00
|
|
|
let outdir = TempDir::new("rustdoctest").ok().expect("rustdoc needs a tempdir");
|
2015-02-26 23:00:43 -06:00
|
|
|
let out = Some(outdir.path().to_path_buf());
|
2015-12-15 03:03:55 -06:00
|
|
|
let mut cfg = config::build_configuration(&sess);
|
|
|
|
cfg.extend(config::parse_cfgspecs(cfgs));
|
2014-12-16 16:32:02 -06:00
|
|
|
let libdir = sess.target_filesearch(PathKind::All).get_lib_path();
|
2015-01-10 20:03:34 -06:00
|
|
|
let mut control = driver::CompileController::basic();
|
|
|
|
if no_run {
|
2015-02-02 18:40:52 -06:00
|
|
|
control.after_analysis.stop = Compilation::Stop;
|
2015-01-10 20:03:34 -06:00
|
|
|
}
|
2015-11-22 13:02:04 -06:00
|
|
|
driver::compile_input(sess, &cstore, cfg, &input, &out, &None, None, control);
|
2013-12-22 13:23:04 -06:00
|
|
|
|
2014-03-08 21:39:01 -06:00
|
|
|
if no_run { return }
|
|
|
|
|
2014-02-28 14:33:49 -06:00
|
|
|
// Run the code!
|
2014-05-15 12:28:46 -05:00
|
|
|
//
|
|
|
|
// We're careful to prepend the *target* dylib search path to the child's
|
|
|
|
// environment to ensure that the target loads the right libraries at
|
|
|
|
// runtime. It would be a sad day if the *host* libraries were loaded as a
|
|
|
|
// mistake.
|
2015-03-26 19:35:13 -05:00
|
|
|
let mut cmd = Command::new(&outdir.path().join("rust_out"));
|
2015-02-26 23:00:43 -06:00
|
|
|
let var = DynamicLibrary::envvar();
|
2014-07-02 15:50:45 -05:00
|
|
|
let newpath = {
|
2015-02-26 23:00:43 -06:00
|
|
|
let path = env::var_os(var).unwrap_or(OsString::new());
|
|
|
|
let mut path = env::split_paths(&path).collect::<Vec<_>>();
|
2014-05-15 12:28:46 -05:00
|
|
|
path.insert(0, libdir.clone());
|
2015-06-10 11:22:20 -05:00
|
|
|
env::join_paths(path).unwrap()
|
2014-05-15 12:28:46 -05:00
|
|
|
};
|
2015-02-26 23:00:43 -06:00
|
|
|
cmd.env(var, &newpath);
|
2014-07-02 15:50:45 -05:00
|
|
|
|
|
|
|
match cmd.output() {
|
2014-10-09 14:17:22 -05:00
|
|
|
Err(e) => panic!("couldn't run the test: {}{}", e,
|
2015-02-26 23:00:43 -06:00
|
|
|
if e.kind() == io::ErrorKind::PermissionDenied {
|
2014-02-26 19:27:30 -06:00
|
|
|
" - maybe your tempdir is mounted with noexec?"
|
|
|
|
} else { "" }),
|
2014-01-30 13:30:21 -06:00
|
|
|
Ok(out) => {
|
2015-01-31 17:08:25 -06:00
|
|
|
if should_panic && out.status.success() {
|
2014-10-09 14:17:22 -05:00
|
|
|
panic!("test executable succeeded when it should have failed");
|
2015-01-31 17:08:25 -06:00
|
|
|
} else if !should_panic && !out.status.success() {
|
2015-03-30 11:59:28 -05:00
|
|
|
panic!("test executable failed:\n{}\n{}",
|
|
|
|
str::from_utf8(&out.stdout).unwrap_or(""),
|
|
|
|
str::from_utf8(&out.stderr).unwrap_or(""));
|
2013-12-22 13:23:04 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-06 20:39:39 -05:00
|
|
|
pub fn maketest(s: &str, cratename: Option<&str>, dont_insert_main: bool,
|
|
|
|
opts: &TestOptions) -> String {
|
2015-03-12 15:01:06 -05:00
|
|
|
let (crate_attrs, everything_else) = partition_source(s);
|
|
|
|
|
2014-06-06 11:12:18 -05:00
|
|
|
let mut prog = String::new();
|
2015-03-12 15:01:06 -05:00
|
|
|
|
|
|
|
// First push any outer attributes from the example, assuming they
|
|
|
|
// are intended to be crate attributes.
|
|
|
|
prog.push_str(&crate_attrs);
|
|
|
|
|
2015-04-06 20:39:39 -05:00
|
|
|
// Next, any attributes for other aspects such as lints.
|
|
|
|
for attr in &opts.attrs {
|
|
|
|
prog.push_str(&format!("#![{}]\n", attr));
|
2014-06-06 11:12:18 -05:00
|
|
|
}
|
2014-03-08 04:30:43 -06:00
|
|
|
|
2014-06-18 03:07:59 -05:00
|
|
|
// Don't inject `extern crate std` because it's already injected by the
|
|
|
|
// compiler.
|
2015-04-19 05:10:45 -05:00
|
|
|
if !s.contains("extern crate") && !opts.no_crate_inject && cratename != Some("std") {
|
2014-06-06 11:12:18 -05:00
|
|
|
match cratename {
|
|
|
|
Some(cratename) => {
|
|
|
|
if s.contains(cratename) {
|
2015-04-06 20:39:39 -05:00
|
|
|
prog.push_str(&format!("extern crate {};\n", cratename));
|
2014-06-06 11:12:18 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {}
|
2014-02-17 22:43:32 -06:00
|
|
|
}
|
2013-12-22 13:23:04 -06:00
|
|
|
}
|
2014-06-19 08:11:18 -05:00
|
|
|
if dont_insert_main || s.contains("fn main") {
|
2015-03-12 15:01:06 -05:00
|
|
|
prog.push_str(&everything_else);
|
2013-12-22 13:23:04 -06:00
|
|
|
} else {
|
2014-06-06 11:12:18 -05:00
|
|
|
prog.push_str("fn main() {\n ");
|
2015-03-12 15:01:06 -05:00
|
|
|
prog.push_str(&everything_else.replace("\n", "\n "));
|
2013-12-22 13:23:04 -06:00
|
|
|
prog.push_str("\n}");
|
|
|
|
}
|
|
|
|
|
2015-03-12 15:01:06 -05:00
|
|
|
info!("final test program: {}", prog);
|
|
|
|
|
2014-05-12 15:44:59 -05:00
|
|
|
return prog
|
2013-12-22 13:23:04 -06:00
|
|
|
}
|
|
|
|
|
2015-03-12 15:01:06 -05:00
|
|
|
fn partition_source(s: &str) -> (String, String) {
|
deprecate Unicode functions that will be moved to crates.io
This patch
1. renames libunicode to librustc_unicode,
2. deprecates several pieces of libunicode (see below), and
3. removes references to deprecated functions from
librustc_driver and libsyntax. This may change pretty-printed
output from these modules in cases involving wide or combining
characters used in filenames, identifiers, etc.
The following functions are marked deprecated:
1. char.width() and str.width():
--> use unicode-width crate
2. str.graphemes() and str.grapheme_indices():
--> use unicode-segmentation crate
3. str.nfd_chars(), str.nfkd_chars(), str.nfc_chars(), str.nfkc_chars(),
char.compose(), char.decompose_canonical(), char.decompose_compatible(),
char.canonical_combining_class():
--> use unicode-normalization crate
2015-04-14 14:52:37 -05:00
|
|
|
use rustc_unicode::str::UnicodeStr;
|
2015-03-12 15:01:06 -05:00
|
|
|
|
|
|
|
let mut after_header = false;
|
|
|
|
let mut before = String::new();
|
|
|
|
let mut after = String::new();
|
|
|
|
|
|
|
|
for line in s.lines() {
|
2015-03-15 19:54:30 -05:00
|
|
|
let trimline = line.trim();
|
2015-03-12 15:01:06 -05:00
|
|
|
let header = trimline.is_whitespace() ||
|
|
|
|
trimline.starts_with("#![feature");
|
|
|
|
if !header || after_header {
|
|
|
|
after_header = true;
|
|
|
|
after.push_str(line);
|
|
|
|
after.push_str("\n");
|
|
|
|
} else {
|
|
|
|
before.push_str(line);
|
|
|
|
before.push_str("\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (before, after);
|
|
|
|
}
|
|
|
|
|
2013-12-22 13:23:04 -06:00
|
|
|
pub struct Collector {
|
2014-03-28 12:27:24 -05:00
|
|
|
pub tests: Vec<testing::TestDescAndFn>,
|
2014-05-22 18:57:53 -05:00
|
|
|
names: Vec<String>,
|
2015-12-15 03:03:55 -06:00
|
|
|
cfgs: Vec<String>,
|
2014-12-16 16:32:02 -06:00
|
|
|
libs: SearchPaths,
|
2014-07-20 01:02:14 -05:00
|
|
|
externs: core::Externs,
|
2015-03-25 19:06:52 -05:00
|
|
|
cnt: usize,
|
2014-03-28 12:27:24 -05:00
|
|
|
use_headers: bool,
|
2014-05-22 18:57:53 -05:00
|
|
|
current_header: Option<String>,
|
|
|
|
cratename: String,
|
2015-04-06 20:39:39 -05:00
|
|
|
opts: TestOptions,
|
2013-12-22 13:23:04 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Collector {
|
2015-12-15 03:03:55 -06:00
|
|
|
pub fn new(cratename: String, cfgs: Vec<String>, libs: SearchPaths, externs: core::Externs,
|
2015-04-06 20:39:39 -05:00
|
|
|
use_headers: bool, opts: TestOptions) -> Collector {
|
2014-03-06 21:31:41 -06:00
|
|
|
Collector {
|
2014-03-05 17:28:08 -06:00
|
|
|
tests: Vec::new(),
|
|
|
|
names: Vec::new(),
|
2015-12-15 03:03:55 -06:00
|
|
|
cfgs: cfgs,
|
2014-03-06 21:31:41 -06:00
|
|
|
libs: libs,
|
2014-07-20 01:02:14 -05:00
|
|
|
externs: externs,
|
2014-03-06 21:31:41 -06:00
|
|
|
cnt: 0,
|
|
|
|
use_headers: use_headers,
|
|
|
|
current_header: None,
|
2014-03-08 04:30:43 -06:00
|
|
|
cratename: cratename,
|
2015-04-06 20:39:39 -05:00
|
|
|
opts: opts,
|
2014-03-06 21:31:41 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-19 08:11:18 -05:00
|
|
|
pub fn add_test(&mut self, test: String,
|
2015-03-15 19:54:30 -05:00
|
|
|
should_panic: bool, no_run: bool, should_ignore: bool,
|
|
|
|
as_test_harness: bool) {
|
2014-03-06 21:31:41 -06:00
|
|
|
let name = if self.use_headers {
|
2015-02-01 20:53:25 -06:00
|
|
|
let s = self.current_header.as_ref().map(|s| &**s).unwrap_or("");
|
2014-05-27 22:44:58 -05:00
|
|
|
format!("{}_{}", s, self.cnt)
|
2014-03-06 21:31:41 -06:00
|
|
|
} else {
|
2015-07-10 07:19:21 -05:00
|
|
|
format!("{}_{}", self.names.join("::"), self.cnt)
|
2014-03-06 21:31:41 -06:00
|
|
|
};
|
2013-12-22 13:23:04 -06:00
|
|
|
self.cnt += 1;
|
2015-12-15 03:03:55 -06:00
|
|
|
let cfgs = self.cfgs.clone();
|
2014-03-09 07:24:58 -05:00
|
|
|
let libs = self.libs.clone();
|
2014-07-20 01:02:14 -05:00
|
|
|
let externs = self.externs.clone();
|
2014-05-25 05:10:11 -05:00
|
|
|
let cratename = self.cratename.to_string();
|
2015-04-06 20:39:39 -05:00
|
|
|
let opts = self.opts.clone();
|
2013-12-28 17:54:56 -06:00
|
|
|
debug!("Creating test {}: {}", name, test);
|
2014-02-13 19:49:11 -06:00
|
|
|
self.tests.push(testing::TestDescAndFn {
|
|
|
|
desc: testing::TestDesc {
|
|
|
|
name: testing::DynTestName(name),
|
2014-04-04 01:03:01 -05:00
|
|
|
ignore: should_ignore,
|
2015-04-06 20:39:39 -05:00
|
|
|
// compiler failures are test failures
|
|
|
|
should_panic: testing::ShouldPanic::No,
|
2013-12-22 13:23:04 -06:00
|
|
|
},
|
2015-04-01 10:12:30 -05:00
|
|
|
testfn: testing::DynTestFn(Box::new(move|| {
|
2015-02-01 20:53:25 -06:00
|
|
|
runtest(&test,
|
|
|
|
&cratename,
|
2015-12-15 03:03:55 -06:00
|
|
|
cfgs,
|
2014-05-12 15:44:59 -05:00
|
|
|
libs,
|
2014-07-20 01:02:14 -05:00
|
|
|
externs,
|
2015-01-31 17:08:25 -06:00
|
|
|
should_panic,
|
2014-06-19 08:11:18 -05:00
|
|
|
no_run,
|
2015-03-15 19:54:30 -05:00
|
|
|
as_test_harness,
|
2015-04-06 20:39:39 -05:00
|
|
|
&opts);
|
2014-11-26 07:12:18 -06:00
|
|
|
}))
|
2013-12-22 13:23:04 -06:00
|
|
|
});
|
|
|
|
}
|
2014-03-06 21:31:41 -06:00
|
|
|
|
|
|
|
pub fn register_header(&mut self, name: &str, level: u32) {
|
|
|
|
if self.use_headers && level == 1 {
|
|
|
|
// we use these headings as test names, so it's good if
|
|
|
|
// they're valid identifiers.
|
|
|
|
let name = name.chars().enumerate().map(|(i, c)| {
|
2014-11-03 17:18:45 -06:00
|
|
|
if (i == 0 && c.is_xid_start()) ||
|
|
|
|
(i != 0 && c.is_xid_continue()) {
|
2014-03-06 21:31:41 -06:00
|
|
|
c
|
|
|
|
} else {
|
|
|
|
'_'
|
|
|
|
}
|
2014-05-22 18:57:53 -05:00
|
|
|
}).collect::<String>();
|
2014-03-06 21:31:41 -06:00
|
|
|
|
|
|
|
// new header => reset count.
|
|
|
|
self.cnt = 0;
|
|
|
|
self.current_header = Some(name);
|
|
|
|
}
|
|
|
|
}
|
2013-12-22 13:23:04 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl DocFolder for Collector {
|
|
|
|
fn fold_item(&mut self, item: clean::Item) -> Option<clean::Item> {
|
2015-11-04 17:41:33 -06:00
|
|
|
let current_name = match item.name {
|
|
|
|
Some(ref name) if !name.is_empty() => Some(name.clone()),
|
|
|
|
_ => typename_if_impl(&item)
|
2013-12-22 13:23:04 -06:00
|
|
|
};
|
2015-11-04 17:41:33 -06:00
|
|
|
|
|
|
|
let pushed = if let Some(name) = current_name {
|
|
|
|
self.names.push(name);
|
|
|
|
true
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
};
|
|
|
|
|
|
|
|
if let Some(doc) = item.doc_value() {
|
|
|
|
self.cnt = 0;
|
|
|
|
markdown::find_testable_code(doc, &mut *self);
|
2013-12-22 13:23:04 -06:00
|
|
|
}
|
2015-11-04 17:41:33 -06:00
|
|
|
|
2013-12-22 13:23:04 -06:00
|
|
|
let ret = self.fold_item_recur(item);
|
|
|
|
if pushed {
|
|
|
|
self.names.pop();
|
|
|
|
}
|
2015-11-04 17:41:33 -06:00
|
|
|
|
2013-12-22 13:23:04 -06:00
|
|
|
return ret;
|
2015-11-04 17:41:33 -06:00
|
|
|
|
|
|
|
// FIXME: it would be better to not have the escaped version in the first place
|
|
|
|
fn unescape_for_testname(mut s: String) -> String {
|
|
|
|
// for refs `&foo`
|
|
|
|
if s.contains("&") {
|
|
|
|
s = s.replace("&", "&");
|
|
|
|
|
|
|
|
// `::&'a mut Foo::` looks weird, let's make it `::<&'a mut Foo>`::
|
|
|
|
if let Some('&') = s.chars().nth(0) {
|
|
|
|
s = format!("<{}>", s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// either `<..>` or `->`
|
|
|
|
if s.contains(">") {
|
|
|
|
s.replace(">", ">")
|
|
|
|
.replace("<", "<")
|
|
|
|
} else {
|
|
|
|
s
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn typename_if_impl(item: &clean::Item) -> Option<String> {
|
|
|
|
if let clean::ItemEnum::ImplItem(ref impl_) = item.inner {
|
|
|
|
let path = impl_.for_.to_string();
|
|
|
|
let unescaped_path = unescape_for_testname(path);
|
|
|
|
Some(unescaped_path)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
2013-12-22 13:23:04 -06:00
|
|
|
}
|
|
|
|
}
|