2014-01-10 15:05:54 +01:00
|
|
|
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
2012-12-04 01:48:01 +01: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.
|
|
|
|
|
2015-03-05 17:53:51 +01:00
|
|
|
// Do not remove on snapshot creation. Needed for bootstrap. (Issue #22364)
|
|
|
|
#![cfg_attr(stage0, feature(custom_attribute))]
|
2014-06-06 22:21:18 +02:00
|
|
|
#![crate_name = "rustdoc"]
|
2015-01-23 03:22:03 +01:00
|
|
|
#![unstable(feature = "rustdoc")]
|
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 15:26:08 +01:00
|
|
|
#![staged_api]
|
2014-03-22 02:05:05 +01:00
|
|
|
#![crate_type = "dylib"]
|
|
|
|
#![crate_type = "rlib"]
|
2014-11-30 14:19:29 +01:00
|
|
|
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
|
|
|
|
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
|
|
|
|
html_root_url = "http://doc.rust-lang.org/nightly/",
|
|
|
|
html_playground_url = "http://play.rust-lang.org/")]
|
2015-01-30 21:26:44 +01:00
|
|
|
|
2015-02-10 22:52:44 +01:00
|
|
|
#![feature(box_patterns)]
|
2015-01-07 15:15:34 +01:00
|
|
|
#![feature(box_syntax)]
|
2015-01-23 03:22:03 +01:00
|
|
|
#![feature(collections)]
|
|
|
|
#![feature(core)]
|
2015-02-27 19:59:59 +01:00
|
|
|
#![feature(exit_status)]
|
2015-01-30 21:26:44 +01:00
|
|
|
#![feature(int_uint)]
|
2015-02-17 20:05:44 +01:00
|
|
|
#![feature(old_io)]
|
2015-01-23 03:22:03 +01:00
|
|
|
#![feature(libc)]
|
|
|
|
#![feature(os)]
|
2015-02-17 20:05:44 +01:00
|
|
|
#![feature(old_path)]
|
2015-01-23 03:22:03 +01:00
|
|
|
#![feature(rustc_private)]
|
2015-01-30 21:26:44 +01:00
|
|
|
#![feature(staged_api)]
|
2015-01-23 03:22:03 +01:00
|
|
|
#![feature(std_misc)]
|
|
|
|
#![feature(test)]
|
|
|
|
#![feature(unicode)]
|
2015-02-18 00:24:34 +01:00
|
|
|
#![feature(str_words)]
|
2015-02-27 06:00:43 +01:00
|
|
|
#![feature(io)]
|
2015-03-07 00:11:59 +01:00
|
|
|
#![feature(file_path)]
|
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-04 04:18:29 +01:00
|
|
|
#![feature(path_ext)]
|
2015-03-09 16:49:10 +01:00
|
|
|
#![feature(path_relative_from)]
|
2013-10-03 03:10:16 +02:00
|
|
|
|
2014-09-06 18:13:40 +02:00
|
|
|
extern crate arena;
|
2014-05-22 20:28:01 +02:00
|
|
|
extern crate getopts;
|
|
|
|
extern crate libc;
|
2014-02-14 19:10:06 +01:00
|
|
|
extern crate rustc;
|
2014-11-16 02:30:33 +01:00
|
|
|
extern crate rustc_trans;
|
2014-11-27 15:57:47 +01:00
|
|
|
extern crate rustc_driver;
|
2015-01-11 03:03:34 +01:00
|
|
|
extern crate rustc_resolve;
|
2015-02-25 12:44:44 +01:00
|
|
|
extern crate rustc_lint;
|
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-04 04:18:29 +01:00
|
|
|
extern crate rustc_back;
|
2014-02-14 19:10:06 +01:00
|
|
|
extern crate serialize;
|
2014-05-22 20:28:01 +02:00
|
|
|
extern crate syntax;
|
2014-09-01 17:59:23 +02:00
|
|
|
extern crate "test" as testing;
|
2015-01-06 18:24:46 +01:00
|
|
|
#[macro_use] extern crate log;
|
2014-05-25 06:15:16 +02:00
|
|
|
|
2014-12-19 07:52:48 +01:00
|
|
|
extern crate "serialize" as rustc_serialize; // used by deriving
|
|
|
|
|
2014-11-14 23:20:57 +01:00
|
|
|
use std::cell::RefCell;
|
2014-07-20 08:02:14 +02:00
|
|
|
use std::collections::HashMap;
|
2015-01-27 21:20:58 +01:00
|
|
|
use std::env;
|
2015-02-27 06:00:43 +01:00
|
|
|
use std::fs::File;
|
|
|
|
use std::io::{self, Read, Write};
|
|
|
|
use std::path::PathBuf;
|
2014-11-14 23:20:57 +01:00
|
|
|
use std::rc::Rc;
|
2015-02-18 00:24:34 +01:00
|
|
|
use std::sync::mpsc::channel;
|
2015-02-27 06:00:43 +01:00
|
|
|
|
2014-06-28 12:35:25 +02:00
|
|
|
use externalfiles::ExternalHtml;
|
2014-12-12 19:59:41 +01:00
|
|
|
use serialize::Decodable;
|
2015-01-04 04:42:21 +01:00
|
|
|
use serialize::json::{self, Json};
|
2014-12-16 23:32:02 +01:00
|
|
|
use rustc::session::search_paths::SearchPaths;
|
2013-09-22 08:25:48 +02:00
|
|
|
|
2014-04-26 15:45:50 +02:00
|
|
|
// reexported from `clean` so it can be easily updated with the mod itself
|
|
|
|
pub use clean::SCHEMA_VERSION;
|
|
|
|
|
2015-01-06 18:24:46 +01:00
|
|
|
#[macro_use]
|
2014-12-19 05:09:57 +01:00
|
|
|
pub mod externalfiles;
|
|
|
|
|
2013-09-22 08:25:48 +02:00
|
|
|
pub mod clean;
|
|
|
|
pub mod core;
|
|
|
|
pub mod doctree;
|
2013-03-01 19:44:43 +01:00
|
|
|
pub mod fold;
|
2013-09-22 08:25:48 +02:00
|
|
|
pub mod html {
|
2014-02-20 10:14:51 +01:00
|
|
|
pub mod highlight;
|
2013-09-28 00:12:23 +02:00
|
|
|
pub mod escape;
|
2014-04-09 09:49:31 +02:00
|
|
|
pub mod item_type;
|
2013-09-28 00:12:23 +02:00
|
|
|
pub mod format;
|
2013-09-22 08:25:48 +02:00
|
|
|
pub mod layout;
|
|
|
|
pub mod markdown;
|
2013-09-28 00:12:23 +02:00
|
|
|
pub mod render;
|
2014-03-07 15:13:17 +01:00
|
|
|
pub mod toc;
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
2014-03-07 04:31:41 +01:00
|
|
|
pub mod markdown;
|
2013-09-22 08:25:48 +02:00
|
|
|
pub mod passes;
|
|
|
|
pub mod plugins;
|
2014-07-04 09:51:46 +02:00
|
|
|
pub mod stability_summary;
|
2013-09-22 08:25:48 +02:00
|
|
|
pub mod visit_ast;
|
2013-12-22 20:23:04 +01:00
|
|
|
pub mod test;
|
2014-03-16 09:08:56 +01:00
|
|
|
mod flock;
|
2013-09-22 08:25:48 +02:00
|
|
|
|
2013-09-24 01:25:58 +02:00
|
|
|
type Pass = (&'static str, // name
|
2014-02-14 05:23:01 +01:00
|
|
|
fn(clean::Crate) -> plugins::PluginResult, // fn
|
2013-09-24 01:25:58 +02:00
|
|
|
&'static str); // description
|
|
|
|
|
2015-02-27 15:36:53 +01:00
|
|
|
const PASSES: &'static [Pass] = &[
|
2013-09-24 01:25:58 +02:00
|
|
|
("strip-hidden", passes::strip_hidden,
|
|
|
|
"strips all doc(hidden) items from the output"),
|
|
|
|
("unindent-comments", passes::unindent_comments,
|
|
|
|
"removes excess indentation on comments in order for markdown to like it"),
|
|
|
|
("collapse-docs", passes::collapse_docs,
|
|
|
|
"concatenates all document attributes into one document attribute"),
|
2013-09-24 22:55:22 +02:00
|
|
|
("strip-private", passes::strip_private,
|
|
|
|
"strips all private items from a crate which cannot be seen externally"),
|
2013-09-24 01:25:58 +02:00
|
|
|
];
|
|
|
|
|
2015-02-27 15:36:53 +01:00
|
|
|
const DEFAULT_PASSES: &'static [&'static str] = &[
|
2013-09-24 23:09:11 +02:00
|
|
|
"strip-hidden",
|
2013-09-24 22:55:22 +02:00
|
|
|
"strip-private",
|
2013-09-25 01:08:07 +02:00
|
|
|
"collapse-docs",
|
|
|
|
"unindent-comments",
|
2013-09-24 01:25:58 +02:00
|
|
|
];
|
|
|
|
|
2014-11-14 23:20:57 +01:00
|
|
|
thread_local!(pub static ANALYSISKEY: Rc<RefCell<Option<core::CrateAnalysis>>> = {
|
|
|
|
Rc::new(RefCell::new(None))
|
2014-11-14 18:18:10 +01:00
|
|
|
});
|
2013-09-22 08:25:48 +02:00
|
|
|
|
2014-11-10 01:09:17 +01:00
|
|
|
struct Output {
|
|
|
|
krate: clean::Crate,
|
|
|
|
json_plugins: Vec<plugins::PluginJson>,
|
|
|
|
passes: Vec<String>,
|
|
|
|
}
|
2012-11-19 02:56:50 +01:00
|
|
|
|
2013-03-01 19:44:43 +01:00
|
|
|
pub fn main() {
|
2015-02-11 20:47:53 +01:00
|
|
|
const STACK_SIZE: usize = 32000000; // 32MB
|
2015-01-06 06:59:45 +01:00
|
|
|
let res = std::thread::Builder::new().stack_size(STACK_SIZE).scoped(move || {
|
2015-02-11 20:47:53 +01:00
|
|
|
let s = env::args().collect::<Vec<_>>();
|
|
|
|
main_args(&s)
|
2015-02-18 00:24:34 +01:00
|
|
|
}).unwrap().join();
|
|
|
|
env::set_exit_status(res as i32);
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
|
|
|
|
2014-03-06 00:28:08 +01:00
|
|
|
pub fn opts() -> Vec<getopts::OptGroup> {
|
2014-02-04 04:14:40 +01:00
|
|
|
use getopts::*;
|
2014-03-06 00:28:08 +01:00
|
|
|
vec!(
|
2013-09-30 21:58:18 +02:00
|
|
|
optflag("h", "help", "show this help message"),
|
2014-12-30 22:27:02 +01:00
|
|
|
optflag("V", "version", "print rustdoc's version"),
|
|
|
|
optflag("v", "verbose", "use verbose output"),
|
2013-09-30 21:58:18 +02:00
|
|
|
optopt("r", "input-format", "the input type of the specified file",
|
|
|
|
"[rust|json]"),
|
|
|
|
optopt("w", "output-format", "the output type to write",
|
|
|
|
"[html|json]"),
|
|
|
|
optopt("o", "output", "where to place the output", "PATH"),
|
2014-07-24 06:46:49 +02:00
|
|
|
optopt("", "crate-name", "specify the name of this crate", "NAME"),
|
2013-09-22 08:25:48 +02:00
|
|
|
optmulti("L", "library-path", "directory to add to crate search path",
|
|
|
|
"DIR"),
|
2013-11-25 05:31:21 +01:00
|
|
|
optmulti("", "cfg", "pass a --cfg to rustc", ""),
|
2014-07-20 08:02:14 +02:00
|
|
|
optmulti("", "extern", "pass an --extern to rustc", "NAME=PATH"),
|
2013-09-22 08:25:48 +02:00
|
|
|
optmulti("", "plugin-path", "directory to load plugins from", "DIR"),
|
2013-09-24 01:25:58 +02:00
|
|
|
optmulti("", "passes", "space separated list of passes to also run, a \
|
|
|
|
value of `list` will print available passes",
|
2013-09-22 08:25:48 +02:00
|
|
|
"PASSES"),
|
|
|
|
optmulti("", "plugins", "space separated list of plugins to also load",
|
|
|
|
"PLUGINS"),
|
2013-09-30 22:28:30 +02:00
|
|
|
optflag("", "no-defaults", "don't run the default passes"),
|
2013-12-22 20:23:04 +01:00
|
|
|
optflag("", "test", "run code examples as tests"),
|
|
|
|
optmulti("", "test-args", "arguments to pass to the test runner",
|
|
|
|
"ARGS"),
|
2014-07-25 16:55:25 +02:00
|
|
|
optopt("", "target", "target triple to document", "TRIPLE"),
|
2014-03-07 04:31:41 +01:00
|
|
|
optmulti("", "markdown-css", "CSS files to include via <link> in a rendered Markdown file",
|
|
|
|
"FILES"),
|
2014-06-28 12:35:25 +02:00
|
|
|
optmulti("", "html-in-header",
|
|
|
|
"files to include inline in the <head> section of a rendered Markdown file \
|
|
|
|
or generated documentation",
|
2014-03-07 04:31:41 +01:00
|
|
|
"FILES"),
|
2014-06-28 12:35:25 +02:00
|
|
|
optmulti("", "html-before-content",
|
2014-03-07 04:31:41 +01:00
|
|
|
"files to include inline between <body> and the content of a rendered \
|
2014-06-28 12:35:25 +02:00
|
|
|
Markdown file or generated documentation",
|
2014-03-07 04:31:41 +01:00
|
|
|
"FILES"),
|
2014-06-28 12:35:25 +02:00
|
|
|
optmulti("", "html-after-content",
|
2014-03-07 04:31:41 +01:00
|
|
|
"files to include inline between the content and </body> of a rendered \
|
2014-06-28 12:35:25 +02:00
|
|
|
Markdown file or generated documentation",
|
2014-06-06 18:12:18 +02:00
|
|
|
"FILES"),
|
|
|
|
optopt("", "markdown-playground-url",
|
2014-07-24 00:43:03 +02:00
|
|
|
"URL to send code snippets to", "URL"),
|
|
|
|
optflag("", "markdown-no-toc", "don't include table of contents")
|
2014-03-06 00:28:08 +01:00
|
|
|
)
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn usage(argv0: &str) {
|
2014-03-06 00:28:08 +01:00
|
|
|
println!("{}",
|
2015-02-02 03:53:25 +01:00
|
|
|
getopts::usage(&format!("{} [options] <input>", argv0),
|
|
|
|
&opts()));
|
2013-08-22 11:41:33 +02:00
|
|
|
}
|
2012-11-19 02:56:50 +01:00
|
|
|
|
2014-05-23 01:57:53 +02:00
|
|
|
pub fn main_args(args: &[String]) -> int {
|
2015-02-02 03:53:25 +01:00
|
|
|
let matches = match getopts::getopts(args.tail(), &opts()) {
|
2014-01-10 15:05:54 +01:00
|
|
|
Ok(m) => m,
|
|
|
|
Err(err) => {
|
2014-06-14 03:11:09 +02:00
|
|
|
println!("{}", err);
|
2014-01-10 15:05:54 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
};
|
2013-09-22 08:25:48 +02:00
|
|
|
if matches.opt_present("h") || matches.opt_present("help") {
|
2015-02-02 03:53:25 +01:00
|
|
|
usage(&args[0]);
|
2013-09-25 01:34:23 +02:00
|
|
|
return 0;
|
2014-01-10 19:05:26 +01:00
|
|
|
} else if matches.opt_present("version") {
|
2014-12-16 01:03:39 +01:00
|
|
|
rustc_driver::version("rustdoc", &matches);
|
|
|
|
return 0;
|
2012-11-19 02:56:50 +01:00
|
|
|
}
|
|
|
|
|
2014-11-21 07:20:04 +01:00
|
|
|
if matches.opt_strs("passes") == ["list"] {
|
2014-07-22 00:37:04 +02:00
|
|
|
println!("Available passes for running rustdoc:");
|
2015-01-31 18:20:46 +01:00
|
|
|
for &(name, _, description) in PASSES {
|
2014-11-17 20:29:38 +01:00
|
|
|
println!("{:>20} - {}", name, description);
|
2014-07-22 00:37:04 +02:00
|
|
|
}
|
|
|
|
println!("{}", "\nDefault passes for rustdoc:"); // FIXME: #9970
|
2015-01-31 18:20:46 +01:00
|
|
|
for &name in DEFAULT_PASSES {
|
2014-11-17 20:29:38 +01:00
|
|
|
println!("{:>20}", name);
|
2014-07-22 00:37:04 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-12-22 20:23:04 +01:00
|
|
|
if matches.free.len() == 0 {
|
2014-01-09 11:06:55 +01:00
|
|
|
println!("expected an input file to act on");
|
2013-12-22 20:23:04 +01:00
|
|
|
return 1;
|
|
|
|
} if matches.free.len() > 1 {
|
2014-01-09 11:06:55 +01:00
|
|
|
println!("only one input file may be specified");
|
2013-12-22 20:23:04 +01:00
|
|
|
return 1;
|
|
|
|
}
|
2015-02-02 03:53:25 +01:00
|
|
|
let input = &matches.free[0];
|
2013-12-22 20:23:04 +01:00
|
|
|
|
2014-12-16 23:32:02 +01:00
|
|
|
let mut libs = SearchPaths::new();
|
2015-01-31 18:20:46 +01:00
|
|
|
for s in &matches.opt_strs("L") {
|
2015-02-02 03:53:25 +01:00
|
|
|
libs.add_path(s);
|
2014-12-16 23:32:02 +01:00
|
|
|
}
|
2014-07-20 08:02:14 +02:00
|
|
|
let externs = match parse_externs(&matches) {
|
|
|
|
Ok(ex) => ex,
|
|
|
|
Err(err) => {
|
|
|
|
println!("{}", err);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
};
|
2014-03-07 04:31:41 +01:00
|
|
|
|
|
|
|
let test_args = matches.opt_strs("test-args");
|
2014-05-23 01:57:53 +02:00
|
|
|
let test_args: Vec<String> = test_args.iter()
|
2015-01-27 03:21:15 +01:00
|
|
|
.flat_map(|s| s.words())
|
2014-05-25 12:17:19 +02:00
|
|
|
.map(|s| s.to_string())
|
2014-05-12 22:44:59 +02:00
|
|
|
.collect();
|
2014-03-07 04:31:41 +01:00
|
|
|
|
|
|
|
let should_test = matches.opt_present("test");
|
|
|
|
let markdown_input = input.ends_with(".md") || input.ends_with(".markdown");
|
|
|
|
|
2015-02-27 06:00:43 +01:00
|
|
|
let output = matches.opt_str("o").map(|s| PathBuf::new(&s));
|
2014-04-02 00:04:42 +02:00
|
|
|
let cfgs = matches.opt_strs("cfg");
|
2014-03-07 04:31:41 +01:00
|
|
|
|
2014-06-28 12:35:25 +02:00
|
|
|
let external_html = match ExternalHtml::load(
|
2015-02-02 03:53:25 +01:00
|
|
|
&matches.opt_strs("html-in-header"),
|
|
|
|
&matches.opt_strs("html-before-content"),
|
|
|
|
&matches.opt_strs("html-after-content")) {
|
2014-06-28 12:35:25 +02:00
|
|
|
Some(eh) => eh,
|
|
|
|
None => return 3
|
|
|
|
};
|
2014-08-01 05:14:59 +02:00
|
|
|
let crate_name = matches.opt_str("crate-name");
|
2014-06-28 12:35:25 +02:00
|
|
|
|
2014-03-07 04:31:41 +01:00
|
|
|
match (should_test, markdown_input) {
|
2014-03-06 00:28:08 +01:00
|
|
|
(true, true) => {
|
2014-07-20 08:02:14 +02:00
|
|
|
return markdown::test(input, libs, externs, test_args)
|
2014-03-06 00:28:08 +01:00
|
|
|
}
|
2014-05-12 22:44:59 +02:00
|
|
|
(true, false) => {
|
2014-08-01 05:14:59 +02:00
|
|
|
return test::run(input, cfgs, libs, externs, test_args, crate_name)
|
2014-05-12 22:44:59 +02:00
|
|
|
}
|
2015-02-27 06:00:43 +01:00
|
|
|
(false, true) => return markdown::render(input,
|
|
|
|
output.unwrap_or(PathBuf::new("doc")),
|
2014-07-24 00:43:03 +02:00
|
|
|
&matches, &external_html,
|
|
|
|
!matches.opt_present("markdown-no-toc")),
|
2014-03-07 04:31:41 +01:00
|
|
|
(false, false) => {}
|
2013-12-22 20:23:04 +01:00
|
|
|
}
|
|
|
|
|
2014-11-10 01:09:17 +01:00
|
|
|
let out = match acquire_input(input, externs, &matches) {
|
|
|
|
Ok(out) => out,
|
2013-09-30 21:58:18 +02:00
|
|
|
Err(s) => {
|
|
|
|
println!("input error: {}", s);
|
2013-09-25 01:34:23 +02:00
|
|
|
return 1;
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
2013-09-30 21:58:18 +02:00
|
|
|
};
|
2014-11-10 01:09:17 +01:00
|
|
|
let Output { krate, json_plugins, passes, } = out;
|
2013-10-21 22:08:31 +02:00
|
|
|
info!("going to format");
|
2015-02-02 03:53:25 +01:00
|
|
|
match matches.opt_str("w").as_ref().map(|s| &**s) {
|
2014-03-07 22:15:50 +01:00
|
|
|
Some("html") | None => {
|
2015-02-27 06:00:43 +01:00
|
|
|
match html::render::run(krate, &external_html,
|
|
|
|
output.unwrap_or(PathBuf::new("doc")),
|
2014-11-10 01:09:17 +01:00
|
|
|
passes.into_iter().collect()) {
|
2014-01-30 20:30:21 +01:00
|
|
|
Ok(()) => {}
|
2014-10-09 21:17:22 +02:00
|
|
|
Err(e) => panic!("failed to generate documentation: {}", e),
|
2014-01-30 20:30:21 +01:00
|
|
|
}
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
2014-03-07 22:15:50 +01:00
|
|
|
Some("json") => {
|
2014-11-10 01:09:17 +01:00
|
|
|
match json_output(krate, json_plugins,
|
2015-02-27 06:00:43 +01:00
|
|
|
output.unwrap_or(PathBuf::new("doc.json"))) {
|
2014-01-30 20:30:21 +01:00
|
|
|
Ok(()) => {}
|
2014-10-09 21:17:22 +02:00
|
|
|
Err(e) => panic!("failed to write json: {}", e),
|
2014-01-30 20:30:21 +01:00
|
|
|
}
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
2013-09-30 21:58:18 +02:00
|
|
|
Some(s) => {
|
|
|
|
println!("unknown output format: {}", s);
|
2013-09-25 01:34:23 +02:00
|
|
|
return 1;
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
2013-09-30 21:58:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Looks inside the command line arguments to extract the relevant input format
|
|
|
|
/// and files and then generates the necessary rustdoc output for formatting.
|
2013-12-22 20:23:04 +01:00
|
|
|
fn acquire_input(input: &str,
|
2014-07-20 08:02:14 +02:00
|
|
|
externs: core::Externs,
|
2014-05-23 01:57:53 +02:00
|
|
|
matches: &getopts::Matches) -> Result<Output, String> {
|
2015-02-02 03:53:25 +01:00
|
|
|
match matches.opt_str("r").as_ref().map(|s| &**s) {
|
2014-07-20 08:02:14 +02:00
|
|
|
Some("rust") => Ok(rust_input(input, externs, matches)),
|
2014-03-07 22:15:50 +01:00
|
|
|
Some("json") => json_input(input),
|
2014-05-28 05:44:58 +02:00
|
|
|
Some(s) => Err(format!("unknown input format: {}", s)),
|
2013-09-30 21:58:18 +02:00
|
|
|
None => {
|
|
|
|
if input.ends_with(".json") {
|
|
|
|
json_input(input)
|
|
|
|
} else {
|
2014-07-20 08:02:14 +02:00
|
|
|
Ok(rust_input(input, externs, matches))
|
2013-09-30 21:58:18 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-20 08:02:14 +02:00
|
|
|
/// Extracts `--extern CRATE=PATH` arguments from `matches` and
|
|
|
|
/// returns a `HashMap` mapping crate names to their paths or else an
|
|
|
|
/// error message.
|
|
|
|
fn parse_externs(matches: &getopts::Matches) -> Result<core::Externs, String> {
|
|
|
|
let mut externs = HashMap::new();
|
2015-01-31 18:20:46 +01:00
|
|
|
for arg in &matches.opt_strs("extern") {
|
2014-11-27 20:19:27 +01:00
|
|
|
let mut parts = arg.splitn(1, '=');
|
2014-07-20 08:02:14 +02:00
|
|
|
let name = match parts.next() {
|
|
|
|
Some(s) => s,
|
|
|
|
None => {
|
|
|
|
return Err("--extern value must not be empty".to_string());
|
|
|
|
}
|
|
|
|
};
|
|
|
|
let location = match parts.next() {
|
|
|
|
Some(s) => s,
|
|
|
|
None => {
|
|
|
|
return Err("--extern value must be of the format `foo=bar`".to_string());
|
|
|
|
}
|
|
|
|
};
|
2015-01-04 20:07:32 +01:00
|
|
|
let name = name.to_string();
|
2015-01-06 17:36:30 +01:00
|
|
|
let locs = externs.entry(name).get().unwrap_or_else(
|
2015-01-04 20:07:32 +01:00
|
|
|
|vacant_entry| vacant_entry.insert(Vec::with_capacity(1)));
|
2014-07-20 08:02:14 +02:00
|
|
|
locs.push(location.to_string());
|
|
|
|
}
|
|
|
|
Ok(externs)
|
|
|
|
}
|
|
|
|
|
2013-09-30 21:58:18 +02:00
|
|
|
/// Interprets the input file as a rust source file, passing it through the
|
|
|
|
/// compiler all the way through the analysis passes. The rustdoc output is then
|
|
|
|
/// generated from the cleaned AST of the crate.
|
|
|
|
///
|
|
|
|
/// This form of input will run all of the plug/cleaning passes
|
2015-03-09 16:49:10 +01:00
|
|
|
#[allow(deprecated)] // for old Path in plugin manager
|
2014-07-20 08:02:14 +02:00
|
|
|
fn rust_input(cratefile: &str, externs: core::Externs, matches: &getopts::Matches) -> Output {
|
2013-09-30 22:28:30 +02:00
|
|
|
let mut default_passes = !matches.opt_present("no-defaults");
|
2013-09-30 21:58:18 +02:00
|
|
|
let mut passes = matches.opt_strs("passes");
|
2014-06-26 08:15:14 +02:00
|
|
|
let mut plugins = matches.opt_strs("plugins");
|
2012-11-19 02:56:50 +01:00
|
|
|
|
2013-09-22 08:25:48 +02:00
|
|
|
// First, parse the crate and extract all relevant information.
|
2014-12-16 23:32:02 +01:00
|
|
|
let mut paths = SearchPaths::new();
|
2015-01-31 18:20:46 +01:00
|
|
|
for s in &matches.opt_strs("L") {
|
2015-02-02 03:53:25 +01:00
|
|
|
paths.add_path(s);
|
2014-12-16 23:32:02 +01:00
|
|
|
}
|
2013-12-04 01:44:16 +01:00
|
|
|
let cfgs = matches.opt_strs("cfg");
|
2014-07-25 16:55:25 +02:00
|
|
|
let triple = matches.opt_str("target");
|
2014-07-20 08:02:14 +02:00
|
|
|
|
2015-02-27 06:00:43 +01:00
|
|
|
let cr = PathBuf::new(cratefile);
|
2013-10-21 22:08:31 +02:00
|
|
|
info!("starting to run rustc");
|
2014-12-07 03:34:37 +01:00
|
|
|
|
2015-02-18 00:24:34 +01:00
|
|
|
let (tx, rx) = channel();
|
|
|
|
std::thread::spawn(move || {
|
2015-01-18 06:02:31 +01:00
|
|
|
use rustc::session::config::Input;
|
|
|
|
|
2015-02-27 06:00:43 +01:00
|
|
|
tx.send(core::run_core(paths, cfgs, externs, Input::File(cr),
|
|
|
|
triple)).unwrap();
|
2014-12-07 03:34:37 +01:00
|
|
|
}).join().map_err(|_| "rustc failed").unwrap();
|
2015-02-18 00:24:34 +01:00
|
|
|
let (mut krate, analysis) = rx.recv().unwrap();
|
2013-10-21 22:08:31 +02:00
|
|
|
info!("finished with rustc");
|
2014-11-14 23:20:57 +01:00
|
|
|
let mut analysis = Some(analysis);
|
|
|
|
ANALYSISKEY.with(|s| {
|
|
|
|
*s.borrow_mut() = analysis.take();
|
|
|
|
});
|
2013-09-22 08:25:48 +02:00
|
|
|
|
2014-07-24 06:46:49 +02:00
|
|
|
match matches.opt_str("crate-name") {
|
|
|
|
Some(name) => krate.name = name,
|
|
|
|
None => {}
|
|
|
|
}
|
|
|
|
|
2013-09-22 08:25:48 +02:00
|
|
|
// Process all of the crate attributes, extracting plugin metadata along
|
|
|
|
// with the passes which we are supposed to run.
|
2014-08-19 02:52:38 +02:00
|
|
|
match krate.module.as_ref().unwrap().doc_list() {
|
2013-09-22 08:25:48 +02:00
|
|
|
Some(nested) => {
|
2015-01-31 18:20:46 +01:00
|
|
|
for inner in nested {
|
2013-09-22 08:25:48 +02:00
|
|
|
match *inner {
|
2014-05-12 22:44:59 +02:00
|
|
|
clean::Word(ref x)
|
2014-11-27 20:19:27 +01:00
|
|
|
if "no_default_passes" == *x => {
|
2013-09-22 08:25:48 +02:00
|
|
|
default_passes = false;
|
|
|
|
}
|
2014-05-12 22:44:59 +02:00
|
|
|
clean::NameValue(ref x, ref value)
|
2014-11-27 20:19:27 +01:00
|
|
|
if "passes" == *x => {
|
|
|
|
for pass in value.words() {
|
2014-05-25 12:17:19 +02:00
|
|
|
passes.push(pass.to_string());
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
|
|
|
}
|
2014-05-12 22:44:59 +02:00
|
|
|
clean::NameValue(ref x, ref value)
|
2014-11-27 20:19:27 +01:00
|
|
|
if "plugins" == *x => {
|
|
|
|
for p in value.words() {
|
2014-05-25 12:17:19 +02:00
|
|
|
plugins.push(p.to_string());
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {}
|
|
|
|
}
|
|
|
|
if default_passes {
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-21 06:59:12 +02:00
|
|
|
for name in DEFAULT_PASSES.iter().rev() {
|
2014-07-14 22:54:10 +02:00
|
|
|
passes.insert(0, name.to_string());
|
2013-09-24 01:25:58 +02:00
|
|
|
}
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
2012-11-19 02:56:50 +01:00
|
|
|
|
2013-09-22 08:25:48 +02:00
|
|
|
// Load all plugins/passes into a PluginManager
|
2014-05-15 06:39:11 +02:00
|
|
|
let path = matches.opt_str("plugin-path")
|
2014-05-25 12:17:19 +02:00
|
|
|
.unwrap_or("/tmp/rustdoc/plugins".to_string());
|
2013-12-04 04:15:12 +01:00
|
|
|
let mut pm = plugins::PluginManager::new(Path::new(path));
|
2015-01-31 18:20:46 +01:00
|
|
|
for pass in &passes {
|
2014-05-15 06:39:11 +02:00
|
|
|
let plugin = match PASSES.iter()
|
|
|
|
.position(|&(p, _, _)| {
|
2014-11-27 20:19:27 +01:00
|
|
|
p == *pass
|
2014-05-15 06:39:11 +02:00
|
|
|
}) {
|
2014-12-09 18:58:15 +01:00
|
|
|
Some(i) => PASSES[i].1,
|
2013-09-24 01:25:58 +02:00
|
|
|
None => {
|
2013-10-21 22:08:31 +02:00
|
|
|
error!("unknown pass {}, skipping", *pass);
|
2013-10-01 23:31:03 +02:00
|
|
|
continue
|
2013-09-24 01:25:58 +02:00
|
|
|
},
|
2013-09-22 08:25:48 +02:00
|
|
|
};
|
|
|
|
pm.add_plugin(plugin);
|
|
|
|
}
|
2013-10-21 22:08:31 +02:00
|
|
|
info!("loading plugins...");
|
2015-02-01 02:03:04 +01:00
|
|
|
for pname in plugins {
|
2013-09-22 08:25:48 +02:00
|
|
|
pm.load_plugin(pname);
|
|
|
|
}
|
2012-11-19 02:56:50 +01:00
|
|
|
|
2013-09-22 08:25:48 +02:00
|
|
|
// Run everything!
|
2013-10-21 22:08:31 +02:00
|
|
|
info!("Executing passes/plugins");
|
2014-11-10 01:09:17 +01:00
|
|
|
let (krate, json) = pm.run_plugins(krate);
|
|
|
|
return Output { krate: krate, json_plugins: json, passes: passes, };
|
2013-09-30 21:58:18 +02:00
|
|
|
}
|
2012-11-19 02:56:50 +01:00
|
|
|
|
2013-09-30 21:58:18 +02:00
|
|
|
/// This input format purely deserializes the json output file. No passes are
|
|
|
|
/// run over the deserialized output.
|
2014-05-23 01:57:53 +02:00
|
|
|
fn json_input(input: &str) -> Result<Output, String> {
|
2015-02-27 06:00:43 +01:00
|
|
|
let mut bytes = Vec::new();
|
|
|
|
match File::open(input).and_then(|mut f| f.read_to_end(&mut bytes)) {
|
|
|
|
Ok(()) => {}
|
|
|
|
Err(e) => return Err(format!("couldn't open {}: {}", input, e)),
|
2013-09-30 21:58:18 +02:00
|
|
|
};
|
2015-02-27 06:00:43 +01:00
|
|
|
match json::from_reader(&mut &bytes[..]) {
|
2014-12-20 09:09:35 +01:00
|
|
|
Err(s) => Err(format!("{:?}", s)),
|
2014-11-26 19:21:45 +01:00
|
|
|
Ok(Json::Object(obj)) => {
|
2013-09-30 21:58:18 +02:00
|
|
|
let mut obj = obj;
|
|
|
|
// Make sure the schema is what we expect
|
2014-11-06 18:25:16 +01:00
|
|
|
match obj.remove(&"schema".to_string()) {
|
2014-11-26 19:21:45 +01:00
|
|
|
Some(Json::String(version)) => {
|
2014-11-27 20:19:27 +01:00
|
|
|
if version != SCHEMA_VERSION {
|
2014-05-28 05:44:58 +02:00
|
|
|
return Err(format!(
|
2014-05-12 22:44:59 +02:00
|
|
|
"sorry, but I only understand version {}",
|
|
|
|
SCHEMA_VERSION))
|
2013-09-30 21:58:18 +02:00
|
|
|
}
|
|
|
|
}
|
2014-05-25 12:17:19 +02:00
|
|
|
Some(..) => return Err("malformed json".to_string()),
|
|
|
|
None => return Err("expected a schema version".to_string()),
|
2013-09-30 21:58:18 +02:00
|
|
|
}
|
2014-11-06 18:25:16 +01:00
|
|
|
let krate = match obj.remove(&"crate".to_string()) {
|
2013-09-30 21:58:18 +02:00
|
|
|
Some(json) => {
|
2013-12-04 04:18:35 +01:00
|
|
|
let mut d = json::Decoder::new(json);
|
2014-03-29 01:05:46 +01:00
|
|
|
Decodable::decode(&mut d).unwrap()
|
2013-09-30 21:58:18 +02:00
|
|
|
}
|
2014-05-25 12:17:19 +02:00
|
|
|
None => return Err("malformed json".to_string()),
|
2013-09-30 21:58:18 +02:00
|
|
|
};
|
2014-01-26 09:43:42 +01:00
|
|
|
// FIXME: this should read from the "plugins" field, but currently
|
2013-09-30 21:58:18 +02:00
|
|
|
// Json doesn't implement decodable...
|
2014-03-06 00:28:08 +01:00
|
|
|
let plugin_output = Vec::new();
|
2014-11-10 01:09:17 +01:00
|
|
|
Ok(Output { krate: krate, json_plugins: plugin_output, passes: Vec::new(), })
|
2013-09-30 21:58:18 +02:00
|
|
|
}
|
2014-05-12 22:44:59 +02:00
|
|
|
Ok(..) => {
|
|
|
|
Err("malformed json input: expected an object at the \
|
2014-05-25 12:17:19 +02:00
|
|
|
top".to_string())
|
2014-05-12 22:44:59 +02:00
|
|
|
}
|
2013-09-22 08:25:48 +02:00
|
|
|
}
|
|
|
|
}
|
2012-11-19 02:56:50 +01:00
|
|
|
|
2013-09-30 21:58:18 +02:00
|
|
|
/// Outputs the crate/plugin json as a giant json blob at the specified
|
|
|
|
/// destination.
|
2014-03-06 00:28:08 +01:00
|
|
|
fn json_output(krate: clean::Crate, res: Vec<plugins::PluginJson> ,
|
2015-02-27 06:00:43 +01:00
|
|
|
dst: PathBuf) -> io::Result<()> {
|
2013-09-22 08:25:48 +02:00
|
|
|
// {
|
|
|
|
// "schema": version,
|
|
|
|
// "crate": { parsed crate ... },
|
|
|
|
// "plugins": { output of plugins ... }
|
|
|
|
// }
|
2014-12-17 16:16:10 +01:00
|
|
|
let mut json = std::collections::BTreeMap::new();
|
2014-11-26 19:21:45 +01:00
|
|
|
json.insert("schema".to_string(), Json::String(SCHEMA_VERSION.to_string()));
|
2014-09-15 05:27:36 +02:00
|
|
|
let plugins_json = res.into_iter()
|
2014-06-28 19:28:29 +02:00
|
|
|
.filter_map(|opt| {
|
|
|
|
match opt {
|
|
|
|
None => None,
|
|
|
|
Some((string, json)) => {
|
|
|
|
Some((string.to_string(), json))
|
2014-05-12 22:44:59 +02:00
|
|
|
}
|
2014-06-28 19:28:29 +02:00
|
|
|
}
|
|
|
|
}).collect();
|
2013-09-22 08:25:48 +02:00
|
|
|
|
|
|
|
// FIXME #8335: yuck, Rust -> str -> JSON round trip! No way to .encode
|
|
|
|
// straight to the Rust JSON representation.
|
2014-12-12 19:59:41 +01:00
|
|
|
let crate_json_str = format!("{}", json::as_json(&krate));
|
2015-02-02 03:53:25 +01:00
|
|
|
let crate_json = match json::from_str(&crate_json_str) {
|
2013-09-22 08:25:48 +02:00
|
|
|
Ok(j) => j,
|
2014-12-20 09:09:35 +01:00
|
|
|
Err(e) => panic!("Rust generated JSON is invalid: {:?}", e)
|
2013-09-22 08:25:48 +02:00
|
|
|
};
|
2012-11-19 02:56:50 +01:00
|
|
|
|
2014-05-25 12:17:19 +02:00
|
|
|
json.insert("crate".to_string(), crate_json);
|
2014-11-26 19:21:45 +01:00
|
|
|
json.insert("plugins".to_string(), Json::Object(plugins_json));
|
2013-09-22 08:25:48 +02:00
|
|
|
|
2014-02-19 19:07:49 +01:00
|
|
|
let mut file = try!(File::create(&dst));
|
2014-12-12 19:59:41 +01:00
|
|
|
write!(&mut file, "{}", Json::Object(json))
|
2012-11-19 02:56:50 +01:00
|
|
|
}
|