Skip to content

Rollup of 10 pull requests #81493

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

Merged
merged 30 commits into from
Jan 29, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8553aee
Use -target when linking binaries for Mac Catalyst
visigoth Dec 20, 2020
63a1eee
Reset LateContext enclosing body in nested items
camsteffen Jan 18, 2021
21fb586
Query for TypeckResults in LateContext::qpath_res
camsteffen Jan 18, 2021
eaba3da
Remove qpath_res util function
camsteffen Jan 18, 2021
f241c10
Improve flatten-fuse tests
SkiFire13 Jan 23, 2021
5aa625b
Manually fuse the inner iterator in FlattenCompat
SkiFire13 Jan 23, 2021
48f9dbf
clean up some const error reporting around promoteds
RalfJung Jan 24, 2021
26b4baf
Point to span of upvar making closure FnMut
sledgehammervampire Jan 18, 2021
c689b97
Split JSON into separately versioned crate
CraftSpider Jan 22, 2021
428bc14
Update cargo.lock
CraftSpider Jan 22, 2021
28f6cab
Allow rustc::default_hash_types in the offending statement
CraftSpider Jan 22, 2021
3c28069
Move into src/etc
CraftSpider Jan 22, 2021
cca4eea
Simplify conversion
CraftSpider Jan 22, 2021
3076e25
`src/etc/json-types` -> `src/rustdoc-json-types`
CraftSpider Jan 24, 2021
67b78a0
Update crate name and add README
CraftSpider Jan 25, 2021
74f26a1
Fix rustdoc page title text selection
probablykasper Jan 28, 2021
cd8dcee
rustdoc: Render HRTB correctly for bare functions
camelid Dec 12, 2020
f902551
Add `SEMICOLON_IN_EXPRESSIONS_FROM_MACROS` lint
Aaron1011 Dec 7, 2020
3aa8456
Fix README typo
CraftSpider Jan 28, 2021
a124043
rustc: Stabilize `-Zrun-dsymutil` as `-Csplit-debuginfo`
alexcrichton Nov 30, 2020
d9e56f4
Rollup merge of #79570 - alexcrichton:split-debuginfo, r=bjorn3
JohnTitor Jan 29, 2021
4003a73
Rollup merge of #79819 - Aaron1011:feature/macro-trailing-semicolon, …
JohnTitor Jan 29, 2021
3eac643
Rollup merge of #79991 - camelid:rustdoc-for-lifetime, r=GuillaumeGom…
JohnTitor Jan 29, 2021
a3c060c
Rollup merge of #80215 - visigoth:issue-80202-fix, r=estebank
JohnTitor Jan 29, 2021
4283623
Rollup merge of #81158 - 1000teslas:issue-80313-fix, r=Aaron1011
JohnTitor Jan 29, 2021
0c5fcce
Rollup merge of #81176 - camsteffen:qpath-res, r=oli-obk
JohnTitor Jan 29, 2021
788036d
Rollup merge of #81287 - CraftSpider:json-crate, r=jyn514,GuillaumeGomez
JohnTitor Jan 29, 2021
94e093a
Rollup merge of #81306 - SkiFire13:fuse-flatten, r=cuviper
JohnTitor Jan 29, 2021
046a414
Rollup merge of #81333 - RalfJung:const-err-simplify, r=oli-obk
JohnTitor Jan 29, 2021
2b4fa3d
Rollup merge of #81459 - probablykasper:text-selection-fix, r=Nemo157
JohnTitor Jan 29, 2021
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
Update crate name and add README
  • Loading branch information
CraftSpider committed Jan 27, 2021
commit 67b78a027111090feccc8434ce9634c9f65ec34d
16 changes: 8 additions & 8 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1637,13 +1637,6 @@ version = "0.11.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5"

[[package]]
name = "json-types"
version = "0.1.0"
dependencies = [
"serde",
]

[[package]]
name = "jsondocck"
version = "0.1.0"
Expand Down Expand Up @@ -4393,17 +4386,24 @@ version = "0.0.0"
dependencies = [
"expect-test",
"itertools 0.9.0",
"json-types",
"minifier",
"pulldown-cmark 0.8.0",
"regex",
"rustc-rayon",
"rustdoc-json-types",
"serde",
"serde_json",
"smallvec 1.4.2",
"tempfile",
]

[[package]]
name = "rustdoc-json-types"
version = "0.1.0"
dependencies = [
"serde",
]

[[package]]
name = "rustdoc-themes"
version = "0.1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ smallvec = "1.0"
tempfile = "3"
itertools = "0.9"
regex = "1"
json-types = { path = "../rustdoc-json-types" }
rustdoc-json-types = { path = "../rustdoc-json-types" }

[dev-dependencies]
expect-test = "1.0"
2 changes: 1 addition & 1 deletion src/librustdoc/json/conversions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use rustc_hir::def::CtorKind;
use rustc_span::def_id::{DefId, CRATE_DEF_INDEX};
use rustc_span::Pos;

use json_types::*;
use rustdoc_json_types::*;

use crate::clean;
use crate::formats::item_type::ItemType;
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/json/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use rustc_middle::ty::TyCtxt;
use rustc_session::Session;
use rustc_span::edition::Edition;

use json_types as types;
use rustdoc_json_types as types;

use crate::clean;
use crate::config::{RenderInfo, RenderOptions};
Expand Down
2 changes: 1 addition & 1 deletion src/rustdoc-json-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "json-types"
name = "rustdoc-json-types"
version = "0.1.0"
authors = ["The Rust Project Developers"]
edition = "2018"
Expand Down
12 changes: 12 additions & 0 deletions src/rustdoc-json-types/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Rustdoc JSON Types

This crate exposes the Rustdoc JSON API as a set of types with serde implementations.
These types are part of the public interface of the rustdoc JSON output, and making them
their own crate allows them to be versioned and distributed without having to depend on
any rustc/rustdoc internals. This way, consumers can rely on this crate for both documentation
of the output, and as a way to read the output easily, and its versioning is intended to
follow semver guarantees about the version of the format. JSON format X will always be
compatible with rustdoc-json-types version N.

Currently, this crate is only used by rustdoc itself. Upon the stabilization of
rustdoc-json, it may be start to be distributed separately for consumers of the API.