Skip to content

Commit 07a63e6

Browse files
committedOct 23, 2020
Auto merge of #78270 - JohnTitor:rollup-bldrjh5, r=JohnTitor
Rollup of 17 pull requests Successful merges: - #77268 (Link to "Contributing to Rust" rather than "Getting Started".) - #77339 (Implement TryFrom between NonZero types.) - #77488 (Mark `repr128` as `incomplete_features`) - #77890 (Fixing escaping to ensure generation of welformed json.) - #77918 (Cleanup network tests) - #77920 (Avoid extraneous space between visibility kw and ident for statics) - #77969 (Doc formating consistency between slice sort and sort_unstable, and big O notation consistency) - #78098 (Clean up and improve some docs) - #78116 (Make inline const work in range patterns) - #78153 (Sync LLVM submodule if it has been initialized) - #78163 (Clean up lib docs) - #78169 (Update cargo) - #78231 (Make closures inherit the parent function's target features) - #78235 (Explain where the closure return type was inferred) - #78255 (Reduce diagram mess in 'match arms have incompatible types' error) - #78263 (Add regression test of issue-77668) - #78265 (Add some inference-related regression tests about incorrect diagnostics) Failed merges: r? `@ghost`
·
1.89.01.49.0
2 parents a9cd294 + b5d2ff0 commit 07a63e6

File tree

53 files changed

+523
-111
lines changed

Some content is hidden

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

53 files changed

+523
-111
lines changed
 

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
Thank you for your interest in contributing to Rust!
44

5-
To get started, read the [Getting Started] guide in the [rustc-dev-guide].
5+
To get started, read the [Contributing to Rust] chapter of the [rustc-dev-guide].
66

77
## Bug reports
88

99
Did a compiler error message tell you to come here? If you want to create an ICE report,
1010
refer to [this section][contributing-bug-reports] and [open an issue][issue template].
1111

12-
[Getting Started]: https://rustc-dev-guide.rust-lang.org/getting-started.html
12+
[Contributing to Rust]: https://rustc-dev-guide.rust-lang.org/contributing.html#contributing-to-rust
1313
[rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/
1414
[contributing-bug-reports]: https://rustc-dev-guide.rust-lang.org/contributing.html#bug-reports
1515
[issue template]: https://github.com/rust-lang/rust/issues/new/choose

‎Cargo.lock

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ dependencies = [
310310
"crypto-hash",
311311
"curl",
312312
"curl-sys",
313-
"env_logger 0.7.1",
313+
"env_logger 0.8.1",
314314
"filetime",
315315
"flate2",
316316
"fwdansi",
@@ -1035,6 +1035,19 @@ dependencies = [
10351035
"termcolor",
10361036
]
10371037

1038+
[[package]]
1039+
name = "env_logger"
1040+
version = "0.8.1"
1041+
source = "registry+https://github.com/rust-lang/crates.io-index"
1042+
checksum = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd"
1043+
dependencies = [
1044+
"atty",
1045+
"humantime 2.0.1",
1046+
"log",
1047+
"regex",
1048+
"termcolor",
1049+
]
1050+
10381051
[[package]]
10391052
name = "error_index_generator"
10401053
version = "0.0.0"

0 commit comments

Comments
 (0)
Please sign in to comment.