diff options
| author | bors <bors@rust-lang.org> | 2019-05-17 00:55:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-17 00:55:01 +0000 |
| commit | 1bbb1353beac929cb5226d7c0cce95c9d0c021bb (patch) | |
| tree | 9e1badb00f6b3b89b907801b66d6343e3ef806eb /src/tools/rustc-std-workspace-alloc | |
| parent | 4f53b5c42baf498b0dd8adbe59aae648a2cf6c14 (diff) | |
| parent | a80a1d0e0d0d9cd47fe6070a7450fa81ccd0856d (diff) | |
| download | rust-1bbb1353beac929cb5226d7c0cce95c9d0c021bb.tar.gz rust-1bbb1353beac929cb5226d7c0cce95c9d0c021bb.zip | |
Auto merge of #60898 - Centril:rollup-76o2g8a, r=Centril
Rollup of 6 pull requests Successful merges: - #60685 (Switch to SPDX 2.1 license expression) - #60687 (Fix .natvis visualizers.) - #60805 (remove compiletest's dependency on `filetime`) - #60862 (Get ty from local_decls instead of using Place) - #60873 (Parse alternative incorrect uses of await and recover) - #60894 (Add entry-like methods to HashSet) Failed merges: r? @ghost
Diffstat (limited to 'src/tools/rustc-std-workspace-alloc')
| -rw-r--r-- | src/tools/rustc-std-workspace-alloc/Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/rustc-std-workspace-alloc/Cargo.toml b/src/tools/rustc-std-workspace-alloc/Cargo.toml index 98578914963..05df1fddc7f 100644 --- a/src/tools/rustc-std-workspace-alloc/Cargo.toml +++ b/src/tools/rustc-std-workspace-alloc/Cargo.toml @@ -2,7 +2,7 @@ name = "rustc-std-workspace-alloc" version = "1.0.0" authors = ["Alex Crichton <alex@alexcrichton.com>"] -license = 'MIT/Apache-2.0' +license = 'MIT OR Apache-2.0' description = """ Hack for the compiler's own build system """ |