diff options
| author | bors <bors@rust-lang.org> | 2020-07-16 07:01:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-16 07:01:59 +0000 |
| commit | 4cd0ee9343da86d9770bf0a514a682d240e0dce8 (patch) | |
| tree | b47df8dd7e6cd3c15ea3dc06e71037ddf1c32e42 /src/libstd | |
| parent | e2e29de5e8a2908260d54182638241ff086a26c2 (diff) | |
| parent | a77813b8d0866a474a9a853d5a479ebc052bef06 (diff) | |
| download | rust-4cd0ee9343da86d9770bf0a514a682d240e0dce8.tar.gz rust-4cd0ee9343da86d9770bf0a514a682d240e0dce8.zip | |
Auto merge of #74388 - Manishearth:rollup-i7iueu8, r=Manishearth
Rollup of 7 pull requests Successful merges: - #73421 (Clarify effect of orphan rule changes on From/Into) - #74037 (Update reference to CONTRIBUTING.md) - #74203 (Enforce the static symbol order.) - #74295 (Add and fix BTreeMap comments) - #74352 (Use local links in the alloc docs.) - #74377 (Move libstd's default feature to libtest) - #74381 (Update docs for str::as_bytes_mut.) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 490afb5a043..29893bd12f1 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -47,8 +47,6 @@ hermit-abi = { version = "0.1.14", features = ['rustc-dep-of-std'] } wasi = { version = "0.9.0", features = ['rustc-dep-of-std'], default-features = false } [features] -default = ["std_detect_file_io", "std_detect_dlsym_getauxval", "panic-unwind"] - backtrace = [ "backtrace_rs/dbghelp", # backtrace/symbolize on MSVC "backtrace_rs/libbacktrace", # symbolize on most platforms diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 5215db7cdb3..4fd5e238eea 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -85,8 +85,9 @@ //! # Contributing changes to the documentation //! //! Check out the rust contribution guidelines [here]( -//! https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md). -//! The source for this documentation can be found on [Github](https://github.com/rust-lang). +//! https://rustc-dev-guide.rust-lang.org/getting-started.html). +//! The source for this documentation can be found on +//! [GitHub](https://github.com/rust-lang/rust). //! To contribute changes, make sure you read the guidelines first, then submit //! pull-requests for your suggested changes. //! |