Merge branch 'trunk' into ci_ssl_fix

This commit is contained in:
Richard Feldman 2021-02-20 23:36:20 -05:00 committed by GitHub
commit c1ee743dc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 648 additions and 325 deletions

View file

@ -880,7 +880,7 @@ impl<'a> Builtin<'a> {
/// Number of machine words in an empty one of these
pub const STR_WORDS: u32 = 2;
pub const DICT_WORDS: u32 = 6;
pub const DICT_WORDS: u32 = 3;
pub const SET_WORDS: u32 = Builtin::DICT_WORDS; // Set is an alias for Dict with {} for value
pub const LIST_WORDS: u32 = 2;