Skip to content

Commit d613cd6

Browse files
weihangloweihanglo
committed
Merge branch 'master' into feat/glob-pattern
2 parents 3d04268 + af64bd6 commit d613cd6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+861
-380
lines changed

‎.github/workflows/contrib.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
run: |
1616
mkdir mdbook
1717
curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.4.3/mdbook-v0.4.3-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
18-
echo ::add-path::`pwd`/mdbook
18+
echo `pwd`/mdbook >> $GITHUB_PATH
1919
- name: Deploy docs
2020
run: |
2121
cd src/doc/contrib

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
- run: |
9898
mkdir mdbook
9999
curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.3.7/mdbook-v0.3.7-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
100-
echo ::add-path::`pwd`/mdbook
100+
echo `pwd`/mdbook >> $GITHUB_PATH
101101
- run: cargo doc --no-deps
102102
- run: cd src/doc && mdbook build --dest-dir ../../target/doc
103103
- run: |

‎CHANGELOG.md

+55-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,66 @@
11
# Changelog
22

3+
## Cargo 1.49 (2020-12-31)
4+
[75615f8e...HEAD](https://github.com/rust-lang/cargo/compare/75615f8e...HEAD)
5+
6+
### Added
7+
- Added `homepage` and `documentation` fields to `cargo metadata`.
8+
[#8744](https://github.com/rust-lang/cargo/pull/8744)
9+
10+
### Changed
11+
- Computed LTO flags are now included in the filename metadata hash so that
12+
changes in LTO settings will independently cache build artifacts instead of
13+
overwriting previous ones. This prevents rebuilds in some situations such as
14+
switching between `cargo build` and `cargo test` in some circumstances.
15+
[#8755](https://github.com/rust-lang/cargo/pull/8755)
16+
17+
### Fixed
18+
- Fixed building a library with both "dylib" and "rlib" crate types with LTO enabled.
19+
[#8754](https://github.com/rust-lang/cargo/pull/8754)
20+
21+
### Nightly only
22+
23+
324
## Cargo 1.48 (2020-11-19)
4-
[51b66125...HEAD](https://github.com/rust-lang/cargo/compare/51b66125...HEAD)
25+
[51b66125...rust-1.48.0](https://github.com/rust-lang/cargo/compare/51b66125...rust-1.48.0)
526

627
### Added
28+
- Added `term.progress` configuration option to control when and how the
29+
progress bar is displayed.
30+
[docs](https://doc.rust-lang.org/nightly/cargo/reference/config.html#termprogresswhen)
31+
[#8165](https://github.com/rust-lang/cargo/pull/8165)
32+
- Added `--message-format plain` option to `cargo locate-project` to display
33+
the project location without JSON to make it easier to use in a script.
34+
[#8707](https://github.com/rust-lang/cargo/pull/8707)
35+
- Added `--workspace` option to `cargo locate-project` to display the path to
36+
the workspace manifest.
37+
[#8712](https://github.com/rust-lang/cargo/pull/8712)
38+
- A new contributor guide has been added for contributing to Cargo itself.
39+
This is published at <https://rust-lang.github.io/cargo/contrib/>.
40+
[#8715](https://github.com/rust-lang/cargo/pull/8715)
41+
- Zsh `--target` completion will now complete with the built-in rustc targets.
42+
[#8740](https://github.com/rust-lang/cargo/pull/8740)
743

844
### Changed
945

1046
### Fixed
11-
- Fixed LTO with doctests.
12-
[#8657](https://github.com/rust-lang/cargo/pull/8657)
47+
- Fixed `cargo new` creating a fossil repository to properly ignore the `target` directory.
48+
[#8671](https://github.com/rust-lang/cargo/pull/8671)
49+
- Don't show warnings about the workspace in the current directory when using `cargo install`
50+
of a remote package.
51+
[#8681](https://github.com/rust-lang/cargo/pull/8681)
52+
- Automatically reinitialize the index when an "Object not found" error is
53+
encountered in the git repository.
54+
[#8735](https://github.com/rust-lang/cargo/pull/8735)
1355

1456
### Nightly only
57+
- Fixed `cargo install` so that it will ignore the `[unstable]` table in local config files.
58+
[#8656](https://github.com/rust-lang/cargo/pull/8656)
59+
- Fixed nondeterministic behavior of the new feature resolver.
60+
[#8701](https://github.com/rust-lang/cargo/pull/8701)
61+
- Fixed running `cargo test` on a proc-macro with the new feature resolver
62+
under a specific combination of circumstances.
63+
[#8742](https://github.com/rust-lang/cargo/pull/8742)
1564

1665
## Cargo 1.47 (2020-10-08)
1766
[4f74d9b2...rust-1.47.0](https://github.com/rust-lang/cargo/compare/4f74d9b2...rust-1.47.0)
@@ -95,6 +144,9 @@
95144
- The `CARGO_TARGET_{triplet}_RUNNER` environment variable will now correctly
96145
override the config file instead of trying to merge the commands.
97146
[#8629](https://github.com/rust-lang/cargo/pull/8629)
147+
- Fixed LTO with doctests.
148+
[#8657](https://github.com/rust-lang/cargo/pull/8657)
149+
[#8658](https://github.com/rust-lang/cargo/pull/8658)
98150

99151
### Nightly only
100152
- Added support for `-Z terminal-width` which tells `rustc` the width of the

‎Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo"
3-
version = "0.49.0"
3+
version = "0.50.0"
44
edition = "2018"
55
authors = ["Yehuda Katz <[email protected]>",
66
"Carl Lerche <[email protected]>",
@@ -23,7 +23,7 @@ atty = "0.2"
2323
bytesize = "1.0"
2424
cargo-platform = { path = "crates/cargo-platform", version = "0.1.1" }
2525
crates-io = { path = "crates/crates-io", version = "0.31.1" }
26-
crossbeam-utils = "0.7"
26+
crossbeam-utils = "0.8"
2727
crypto-hash = "0.3.1"
2828
curl = { version = "0.4.23", features = ["http2"] }
2929
curl-sys = "0.4.22"
@@ -32,7 +32,7 @@ pretty_env_logger = { version = "0.4", optional = true }
3232
anyhow = "1.0"
3333
filetime = "0.2.9"
3434
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
35-
git2 = "0.13.5"
35+
git2 = "0.13.12"
3636
git2-curl = "0.14.0"
3737
glob = "0.3.0"
3838
hex = "0.4"
@@ -44,7 +44,7 @@ jobserver = "0.1.21"
4444
lazycell = "1.2.0"
4545
libc = "0.2"
4646
log = "0.4.6"
47-
libgit2-sys = "0.12.7"
47+
libgit2-sys = "0.12.14"
4848
memchr = "2.1.3"
4949
num_cpus = "1.0"
5050
opener = "0.4"
@@ -60,7 +60,7 @@ strip-ansi-escapes = "0.1.0"
6060
tar = { version = "0.4.26", default-features = false }
6161
tempfile = "3.0"
6262
termcolor = "1.1"
63-
toml = "0.5.3"
63+
toml = "0.5.7"
6464
unicode-xid = "0.2.0"
6565
url = "2.0"
6666
walkdir = "2.2"

‎ci/validate-man.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55

66
cd src/doc
77

8-
changes=$(git status --porcelain .)
8+
changes=$(git status --porcelain)
99
if [ -n "$changes" ]
1010
then
1111
echo "git directory must be clean before running this script."
@@ -14,7 +14,7 @@ fi
1414

1515
./build-man.sh
1616

17-
changes=$(git status --porcelain .)
17+
changes=$(git status --porcelain)
1818
if [ -n "$changes" ]
1919
then
2020
echo "Detected changes in man pages:"

‎crates/cargo-test-support/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1521,6 +1521,7 @@ fn substitute_macros(input: &str) -> String {
15211521
("[ERROR]", "error:"),
15221522
("[WARNING]", "warning:"),
15231523
("[NOTE]", "note:"),
1524+
("[HELP]", "help:"),
15241525
("[DOCUMENTING]", " Documenting"),
15251526
("[FRESH]", " Fresh"),
15261527
("[UPDATING]", " Updating"),

‎crates/mdman/src/format/md.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@ use crate::util::unwrap;
44
use crate::ManMap;
55
use anyhow::{bail, format_err, Error};
66
use std::fmt::Write;
7-
use url::Url;
87

98
pub struct MdFormatter {
10-
url: Option<Url>,
119
man_map: ManMap,
1210
}
1311

1412
impl MdFormatter {
15-
pub fn new(url: Option<Url>, man_map: ManMap) -> MdFormatter {
16-
MdFormatter { url, man_map }
13+
pub fn new(man_map: ManMap) -> MdFormatter {
14+
MdFormatter { man_map }
1715
}
1816
}
1917

2018
impl MdFormatter {
2119
fn render_html(&self, input: &str) -> Result<String, Error> {
22-
let parser = crate::md_parser(input, self.url.clone());
20+
let parser = crate::md_parser(input, None);
2321
let mut html_output: String = String::with_capacity(input.len() * 3 / 2);
2422
pulldown_cmark::html::push_html(&mut html_output, parser.map(|(e, _r)| e));
2523
Ok(html_output)
@@ -78,7 +76,7 @@ impl super::Formatter for MdFormatter {
7876
fn linkify_man_to_md(&self, name: &str, section: u8) -> Result<String, Error> {
7977
let s = match self.man_map.get(&(name.to_string(), section)) {
8078
Some(link) => format!("[{}({})]({})", name, section, link),
81-
None => format!("[{}({})]({}.md)", name, section, name),
79+
None => format!("[{}({})]({}.html)", name, section, name),
8280
};
8381
Ok(s)
8482
}

‎crates/mdman/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub fn convert(
5050
) -> Result<String, Error> {
5151
let formatter: Box<dyn Formatter + Send + Sync> = match format {
5252
Format::Man => Box::new(format::man::ManFormatter::new(url)),
53-
Format::Md => Box::new(format::md::MdFormatter::new(url, man_map)),
53+
Format::Md => Box::new(format::md::MdFormatter::new(man_map)),
5454
Format::Text => Box::new(format::text::TextFormatter::new(url)),
5555
};
5656
let expanded = hbs::expand(file, &*formatter)?;

‎crates/mdman/tests/compare/expected/links.1

+14
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,17 @@ Shortcut unknown: [shortcut unknown]
2929
\fBother\-cmd\fR(1)
3030
.sp
3131
\fBlocal\-cmd\fR(1)
32+
.sp
33+
\fISome link\fR <https://example.org/foo.html>
34+
.sp
35+
\fB\-\-include\fR
36+
.RS 4
37+
Testing an \fIincluded link\fR <https://example.org/included_link.html>\&.
38+
.RE
39+
.SH "OPTIONS"
40+
.sp
41+
\fB\-\-foo\-bar\fR
42+
.RS 4
43+
Example \fIlink\fR <https://example.org/bar.html>\&.
44+
See \fBother\-cmd\fR(1), \fBlocal\-cmd\fR(1)
45+
.RE

‎crates/mdman/tests/compare/expected/links.md

+22-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,28 @@ Shortcut unknown: [shortcut unknown]
2828

2929
[other-cmd(1)](https://example.org/commands/other-cmd.html)
3030

31-
[local-cmd(1)](local-cmd.md)
31+
[local-cmd(1)](local-cmd.html)
32+
33+
[Some link](foo.html)
34+
35+
<dl>
36+
<dt class="option-term" id="option-links---include"><a class="option-anchor" href="#option-links---include"></a><code>--include</code></dt>
37+
<dd class="option-desc">Testing an <a href="included_link.html">included link</a>.</dd>
38+
39+
</dl>
40+
41+
42+
## OPTIONS
43+
44+
<dl>
45+
46+
<dt class="option-term" id="option-links---foo-bar"><a class="option-anchor" href="#option-links---foo-bar"></a><code>--foo-bar</code></dt>
47+
<dd class="option-desc">Example <a href="bar.html">link</a>.
48+
See <a href="https://example.org/commands/other-cmd.html">other-cmd(1)</a>, <a href="local-cmd.html">local-cmd(1)</a></dd>
49+
50+
51+
</dl>
52+
3253

3354
[bar]: https://example.com/bar
3455
[collapsed]: https://example.com/collapsed

‎crates/mdman/tests/compare/expected/links.txt

+10
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,13 @@ DESCRIPTION
2828

2929
local-cmd(1)
3030

31+
Some link <https://example.org/foo.html>
32+
33+
--include
34+
Testing an included link <https://example.org/included_link.html>.
35+
36+
OPTIONS
37+
--foo-bar
38+
Example link <https://example.org/bar.html>. See other-cmd(1),
39+
local-cmd(1)
40+

‎crates/mdman/tests/compare/expected/options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ A description of the command.
7474
my-command --xyz
7575

7676
## SEE ALSO
77-
[other-command(1)](other-command.md) [abc(7)](abc.md)
77+
[other-command(1)](other-command.html) [abc(7)](abc.html)

‎crates/mdman/tests/compare/includes/links-include.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[Some link](foo.html)
2+
3+
{{#options}}
4+
{{#option "`--include`"}}
5+
Testing an [included link](included_link.html).
6+
{{/option}}
7+
{{/options}}

‎crates/mdman/tests/compare/links.md

+14
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@ Shortcut unknown: [shortcut unknown]
3030

3131
{{man "local-cmd" 1}}
3232

33+
{{> links-include}}
34+
35+
## OPTIONS
36+
37+
{{#options}}
38+
39+
{{#option "`--foo-bar`"}}
40+
Example [link](bar.html).
41+
See {{man "other-cmd" 1}}, {{man "local-cmd" 1}}
42+
{{/option}}
43+
44+
{{/options}}
45+
46+
3347
[bar]: https://example.com/bar
3448
[collapsed]: https://example.com/collapsed
3549
[shortcut]: https://example.com/shortcut

‎src/bin/cargo/commands/tree.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ pub fn cli() -> App {
2626
)
2727
.arg_features()
2828
.arg_target_triple(
29-
"Filter dependencies matching the given target-triple (default host platform)",
29+
"Filter dependencies matching the given target-triple (default host platform). \
30+
Pass `all` to include all targets.",
3031
)
3132
.arg(
3233
Arg::with_name("no-dev-dependencies")

‎src/cargo/core/compiler/context/compilation_files.rs

+1
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@ fn compute_metadata(
519519
// settings like debuginfo and whatnot.
520520
unit.profile.hash(&mut hasher);
521521
unit.mode.hash(&mut hasher);
522+
cx.lto[unit].hash(&mut hasher);
522523

523524
// Artifacts compiled for the host should have a different metadata
524525
// piece than those compiled for the target, so make sure we throw in

‎src/cargo/core/compiler/context/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
126126
let mut queue = JobQueue::new(self.bcx);
127127
let mut plan = BuildPlan::new();
128128
let build_plan = self.bcx.build_config.build_plan;
129+
self.lto = super::lto::generate(&self.bcx)?;
129130
self.prepare_units()?;
130131
self.prepare()?;
131132
custom_build::build_map(&mut self)?;
132-
super::lto::generate(&mut self)?;
133133
self.check_collistions()?;
134134

135135
for unit in &self.bcx.roots {

‎src/cargo/core/compiler/fingerprint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
//! -C incremental=… flag | ✓ |
7373
//! mtime of sources | ✓[^3] |
7474
//! RUSTFLAGS/RUSTDOCFLAGS | ✓ |
75-
//! LTO flags | ✓ |
75+
//! LTO flags | ✓ | ✓
7676
//! config settings[^5] | ✓ |
7777
//! is_std | | ✓
7878
//!

0 commit comments

Comments
 (0)