Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[beta] Beta rollups #84382

Merged
merged 3 commits into from
Apr 21, 2021
Merged

[beta] Beta rollups #84382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f3aa4b
[beta] Update cargo
ehuss Apr 21, 2021
97ffd54
Auto merge of #84394 - m-ou-se:upgrade-ci-dep-expat, r=Mark-Simulacrum
bors Apr 21, 2021
9787d0c
Rollup merge of #83678 - GuillaumeGomez:hack-Self-keyword-conflict, r…
Dylan-DPC Mar 30, 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
6 changes: 5 additions & 1 deletion library/std/src/keyword_docs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,11 @@ mod return_keyword {}
/// [Reference]: ../reference/items/associated-items.html#methods
mod self_keyword {}

#[doc(keyword = "Self")]
// FIXME: Once rustdoc can handle URL conflicts on case insensitive file systems, we can remove the
// three next lines and put back: `#[doc(keyword = "Self")]`.
#[doc(alias = "Self")]
#[allow(rustc::existing_doc_keyword)]
#[doc(keyword = "SelfTy")]
//
/// The implementing type within a [`trait`] or [`impl`] block, or the current type within a type
/// definition.
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ CT_EXPAT_PATCH_GLOBAL=y
CT_EXPAT_PATCH_ORDER="global"
CT_EXPAT_V_2_2=y
# CT_EXPAT_NO_VERSIONS is not set
CT_EXPAT_VERSION="2.2.6"
CT_EXPAT_VERSION="2.3.0"
CT_EXPAT_MIRRORS="http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}"
CT_EXPAT_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_EXPAT_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 14 files
+30 −13 src/cargo/core/compiler/custom_build.rs
+4 −0 src/cargo/core/package.rs
+48 −0 src/cargo/core/resolver/dep_cache.rs
+2 −1 src/cargo/core/resolver/mod.rs
+1 −1 src/cargo/core/resolver/resolve.rs
+74 −4 src/cargo/core/source/source_id.rs
+3 −29 src/cargo/ops/resolve.rs
+5 −3 src/cargo/sources/git/source.rs
+156 −11 src/cargo/sources/git/utils.rs
+1 −1 src/cargo/sources/registry/remote.rs
+53 −10 tests/testsuite/build_script_env.rs
+17 −7 tests/testsuite/git.rs
+0 −8 tests/testsuite/lockfile_compat.rs
+2 −1 tests/testsuite/update.rs