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

Improve FlashString portability #2796

Merged
merged 4 commits into from
Jun 11, 2024
Merged

Improve FlashString portability #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
797e19a
Remove copy support from FlashString
Jun 10, 2024
54237f1
`fileSetContent` passing copy of content, should be reference
Jun 10, 2024
2b67e16
IFS methods using pass-by-copy in parameter packs
Jun 10, 2024
9c5ee6d
Add upgrade note.
Jun 10, 2024
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
2 changes: 1 addition & 1 deletion Sming/Components/FlashString
Open in desktop
Submodule FlashString updated 20 files
+2 −2 map.rst
+19 −43 object.rst
+1 −20 src/ObjectBase.cpp
+5 −5 src/include/FlashString/Array.hpp
+7 −7 src/include/FlashString/Map.hpp
+17 −65 src/include/FlashString/Object.hpp
+3 −16 src/include/FlashString/ObjectBase.hpp
+28 −8 src/include/FlashString/String.hpp
+7 −7 src/include/FlashString/Vector.hpp
+5 −231 src/include/FlashString/config.hpp
+2 −2 string.rst
+1 −1 test/app/array.cpp
+5 −0 test/app/custom.cpp
+1 −2 test/app/data.cpp
+7 −0 test/app/speed.cpp
+4 −18 test/app/string.cpp
+0 −8 todo.rst
+0 −22 tools/genm.py
+9 −0 upgrade.rst
+4 −9 vector.rst
2 changes: 1 addition & 1 deletion Sming/Components/IFS
Open in desktop
Submodule IFS updated 4 files
+1 −1 src/UserRole.cpp
+1 −1 src/include/IFS/FWFS/ArchiveStream.h
+4 −4 src/include/IFS/File.h
+2 −2 src/include/IFS/FileSystem.h
3 changes: 2 additions & 1 deletion Sming/Core/FileSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ template <typename TFileName> inline int fileSetContent(const TFileName& fileNam
return fileSystem->setContent(fileName, content, length);
}

template <typename TFileName, typename TContent> inline int fileSetContent(const TFileName& fileName, TContent content)
template <typename TFileName, typename TContent>
inline int fileSetContent(const TFileName& fileName, const TContent& content)
{
CHECK_FS(setContent)
return fileSystem->setContent(fileName, content);
Expand Down
16 changes: 16 additions & 0 deletions docs/source/upgrading/5.1-5.2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,19 @@ Applications must explicitly call :cpp:func:`HttpRequest::onSslInit` and set the
This extra step ensures that security checks are not unintentionally bypassed.

The same behaviour is now presented when using Bearssl, and will now fail with ``X509_NOT_TRUSTED``.


**FlashString copy support removed**

The :library:`FlashString` previously supported copies (references) like this::

FlashString emptyString;
FlashString stringCopy(FS("Inline string"));

DEFINE_FSTR_DATA_LOCAL(flashHelloData, "Hello");
auto myCopy = flashHelloData;

These will now fail to compile.
Copy construction and assignment has been explicitly deleted so avoid unintentional side-effects.

Objects should always be passed by reference.
Loading